添加字段

nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java

@@ -308,8 +308,10 @@ public class InvoicingApi {
     @ApiOperation(value="库存预警添加全部物料", notes="库存预警添加全部物料")
     @AutoLog(value = "库存预警添加全部物料")
     @PostMapping(value = "/addWaringAll")
-    public Result<String> addWaringAll() {
+    public Result<String> addWaringAll(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
-        CgdInfoEntity cgdInfoEntityDto = new CgdInfoEntity();
+        if(StringUtils.isEmpty(cgdInfoEntityDto.getNuId())){
+            return Result.error("请选择仓库");
+        }
         String result = invoicingApi.addWaringAll(cgdInfoEntityDto);
         return Result.OK("添加成功！");
     }

nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java

@@ -88,6 +88,36 @@ public class QgdInfoEntity implements Serializable {
     private String materialImg;
     private String tagType;
     private String tagName;
+    @Dict(dictTable = "nu_config_suppliers_info", dicText = "suppliers_name", dicCode = "id")
     private String suppliers;
 
+
+    @TableField(exist = false)
+    private String unitPrice;
+
+    @TableField(exist = false)
+    private String materialUnits;
+
+    @TableField(exist = false)
+    private String oneUnit;
+
+    @TableField(exist = false)
+    private String oneUnitProportion;
+
+    @TableField(exist = false)
+    private String oneUnitPrice;
+
+    @TableField(exist = false)
+    private String twoUnit;
+
+    @TableField(exist = false)
+    private String twoUnitProportion;
+
+    @TableField(exist = false)
+    private String twoUnitPrice;
+
+    @TableField(exist = false)
+    private String multiUnitType;
+
+
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java

@@ -742,6 +742,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Override
     public String addWaringAll(CgdInfoEntity cgdInfoEntityDto) {
         QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = new QueryWrapper<>() ;
+        queryWrapper.eq("nu_id",cgdInfoEntityDto.getNuId());
         queryWrapper.apply("kcsl <= lower_limit");//库存小于下限的数据
         queryWrapper.eq("del_flag","0");//查询未删除的数据
         queryWrapper.eq("iz_enabled","0");//查询启用的数据

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/entity/QgdInfo.java

@@ -128,4 +128,36 @@ public class QgdInfo implements Serializable {
     @TableField(exist = false)
     private String tagName;
 
+
+
+    @TableField(exist = false)
+    private String unitPrice;
+
+    @TableField(exist = false)
+    private String materialUnits;
+
+    @TableField(exist = false)
+    private String oneUnit;
+
+    @TableField(exist = false)
+    private String oneUnitProportion;
+
+    @TableField(exist = false)
+    private String oneUnitPrice;
+
+    @TableField(exist = false)
+    private String twoUnit;
+
+    @TableField(exist = false)
+    private String twoUnitProportion;
+
+    @TableField(exist = false)
+    private String twoUnitPrice;
+
+    @TableField(exist = false)
+    private String multiUnitType;
+
+    @TableField(exist = false)
+    private String suppliers;
+
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/mapper/xml/QgdInfoMapper.xml

@@ -22,7 +22,17 @@
         c.medication_id,
         c.tag_type,
         d.item_text as tagName,
-        c.material_img
+        c.material_img,
+        c.reference_unit_price as unitPrice,
+        c.material_units,
+        c.one_unit,
+        c.one_unit_proportion,
+        c.one_unit_price,
+        c.two_unit,
+        c.two_unit_proportion,
+        c.two_unit_price,
+        c.multi_unit_type,
+        c.suppliers
         FROM nu_invoicing_qgd_info a
         LEFT JOIN nu_warehouse_material_info b on a.wl_id = b.wl_id  and b.del_flag='0' and b.iz_enabled='0'
         LEFT JOIN nu_config_material_info c on a.wl_id = c.id