diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java index 12ba7427..451146c0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java @@ -94,6 +94,8 @@ public class NuWarehouseMaterialCrkInfo implements Serializable { @Dict(dicCode = "crk_status") private String crkStatus; + private Integer ddwNum;//多单位时的数量 + @TableField(exist = false) private String paramDate; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index b4665220..54820020 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -1059,6 +1059,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgsl - rksl - xzsl){ @@ -1082,7 +1083,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl0 && StringUtils.equals("0",jhType)){ + if(crkInfo.getCrkNum()>0){ crkInfoMapper.insert(crkInfo); } @@ -1154,7 +1155,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl