添加单据字段
This commit is contained in:
parent
47f062c8f5
commit
109774f1a0
|
|
@ -105,6 +105,6 @@ public class CgdMainEntity implements Serializable {
|
|||
@ApiModelProperty(value = "审核时间")
|
||||
private Date wjTime;
|
||||
|
||||
|
||||
private String nuId;
|
||||
private String izNew;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -245,7 +245,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
List<NuInvoicingCgdMain> mapList = new ArrayList<>();
|
||||
// 创建一个临时Map来按suppliersId分组
|
||||
Map<String, List<QgdInfo>> tempMap = new HashMap<>();
|
||||
String nuId = "";
|
||||
String nuId = infoEntityList.get(0).getNuId();
|
||||
|
||||
|
||||
for (QgdInfoEntity qgdInfoEntity : infoEntityList) {
|
||||
String suppliersId = qgdInfoEntity.getSuppliersId();
|
||||
|
|
@ -289,6 +290,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
cgdMain.setStatus("0");//待入库
|
||||
cgdMain.setCgdType("0");//待入库
|
||||
cgdMain.setGysName(ConfigSuppliersInfo.getSuppliersName());
|
||||
cgdMain.setNuId(nuId);
|
||||
List<NuInvoicingCgdInfo> cgdInfoList = new ArrayList<>();
|
||||
BigDecimal totalPrice = new BigDecimal(0);
|
||||
String qgdId = "";
|
||||
|
|
@ -397,6 +399,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
|
||||
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
|
||||
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
|
||||
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
|
||||
// queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
|
||||
if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
|
||||
if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
|
||||
|
|
|
|||
Loading…
Reference in New Issue