From 5cb1d2bd9c39fa8417d0bb75406746950fb9ae99 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 15 Oct 2025 16:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NuInvoicingCgdMainServiceImpl.java     |  4 ++--
 .../qgd/service/impl/QgdInfoServiceImpl.java    |  4 ++--
 .../BlWarehouseMaterialInfoController.java      |  4 ++--
 .../entity/BlWarehouseMaterialInfo.java         | 17 +++++++++--------
 .../xml/BlWarehouseMaterialInfoMapper.xml       |  7 ++++---
 .../modules/nubaseinfo/entity/NuBaseInfo.java   |  9 +++++++++
 6 files changed, 28 insertions(+), 17 deletions(-)

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 41f87e36..ea3d7cb9 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
@@ -230,8 +230,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
                 info.setWlMaterialNo(ConfigMaterialInfo.getMaterialNo());
                 info.setWlSpecificationModel(ConfigMaterialInfo.getSpecificationModel());
                 info.setWlUnits(ConfigMaterialInfo.getMaterialUnits());
-                info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit());
-                info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit());
+                info.setWlUpperLimit(ConfigMaterialInfo.getUpperLimit());
+                info.setWlLowerLimit(ConfigMaterialInfo.getLowerLimit());
                 if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){
                     info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+"");
                 }else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java
index 8e581a7f..7fb38a39 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java
@@ -79,8 +79,8 @@ public class QgdInfoServiceImpl extends ServiceImpl<QgdInfoMapper, QgdInfo> impl
                 info.setWlMaterialNo(ConfigMaterialInfo.getMaterialNo());
                 info.setWlSpecificationModel(ConfigMaterialInfo.getSpecificationModel());
                 info.setWlUnits(ConfigMaterialInfo.getMaterialUnits());
-                info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit());
-                info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit());
+                info.setWlUpperLimit(ConfigMaterialInfo.getUpperLimit());
+                info.setWlLowerLimit(ConfigMaterialInfo.getLowerLimit());
                 if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){
                     info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+"");
                 }else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
index 4abf519a..60f8fd32 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
@@ -98,8 +98,8 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
 				BlWarehouseMaterialInfo blWarehouseMaterialInfo1 = new BlWarehouseMaterialInfo();
 				blWarehouseMaterialInfo1.setNuId(blWarehouseMaterialInfo.getNuId());
 				blWarehouseMaterialInfo1.setWlId(wlId);
-				blWarehouseMaterialInfo1.setUpperLimit(blWarehouseMaterialInfo.getUpperLimit());
-				blWarehouseMaterialInfo1.setLowerLimit(blWarehouseMaterialInfo.getLowerLimit());
+//				blWarehouseMaterialInfo1.setUpperLimit(blWarehouseMaterialInfo.getUpperLimit());
+//				blWarehouseMaterialInfo1.setLowerLimit(blWarehouseMaterialInfo.getLowerLimit());
 				blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo1);
 			}
 		}
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
index 406eb2a0..e1bc6b63 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
@@ -67,14 +67,7 @@ public class BlWarehouseMaterialInfo implements Serializable {
     @Dict(dictTable = "nu_config_material_info", dicText = "material_name", dicCode = "id")
     @ApiModelProperty(value = "物料")
     private java.lang.String wlId;
-    /**物料上限*/
-    @Excel(name = "物料上限", width = 15)
-    @ApiModelProperty(value = "物料上限")
-    private java.lang.String upperLimit;
-    /**物料下限*/
-    @Excel(name = "物料下限", width = 15)
-    @ApiModelProperty(value = "物料下限")
-    private java.lang.String lowerLimit;
+
     /**库存数量*/
     @Excel(name = "库存数量", width = 15)
     @ApiModelProperty(value = "库存数量")
@@ -170,6 +163,14 @@ public class BlWarehouseMaterialInfo implements Serializable {
     @ApiModelProperty(value = "多单位采购默认使用  0子集 1父级 2爷级")
     private java.lang.String multiUnitType;
 
+    /**物料上限*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "物料上限")
+    private java.lang.String upperLimit;
+    /**物料下限*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "物料下限")
+    private java.lang.String lowerLimit;
 
     @TableField(exist = false)
     private java.lang.String wlParamInfo;//查询物料信息参数，可多个查询
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
index dd8f1736..45020526 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
@@ -22,9 +22,10 @@
                 b.two_unit,
                 b.two_unit_proportion,
                 b.two_unit_price,
-                b.multi_unit_type
-
-        from nu_warehouse_material_info a
+                b.multi_unit_type,
+                b.upper_limit,
+                b.lower_limit
+            from nu_warehouse_material_info a
             left join nu_config_material_info b on a.wl_id = b.id
         ) a
         ${ew.customSqlSegment}
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
index 074a97cb..b84e2a21 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
@@ -130,6 +130,15 @@ public class NuBaseInfo implements Serializable {
     @ApiModelProperty(value = "是否已同步0已同步 1未同步")
     private java.lang.String izSync;
 
+    @ApiModelProperty(value = "负责人")
+    private java.lang.String fzr;
+
+    @ApiModelProperty(value = "负责人电话")
+    private java.lang.String fzrTel;
+
+    @ApiModelProperty(value = "负责人头像")
+    private java.lang.String fzrHeadPath;
+
     @TableField(exist = false)
     private String deviceId;//摄像头 ID
     @TableField(exist = false)