From ce61f62bf38266e17b3c05e600e7ea53ac41a04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 22 Apr 2023 10:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=A8=A1=E5=9D=97=E4=B8=AD=EF=BC=8C=E5=8D=95=E4=BB=B7?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=97=A0=E6=B3=95=E5=8D=95=E4=B8=AA=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/datasource/mappers/MaterialExtendMapperEx.java |  2 ++
 .../service/materialExtend/MaterialExtendService.java  | 10 ++++++----
 .../resources/mapper_xml/MaterialExtendMapperEx.xml    | 10 ++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java
index 9eb1db01..b2bce012 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java
@@ -22,4 +22,6 @@ public interface MaterialExtendMapperEx {
     List<MaterialExtend> getListByMId(@Param("ids") Long ids[]);
 
     int batchDeleteMaterialExtendByMIds(@Param("ids") String ids[]);
+
+    int specialUpdatePrice(MaterialExtend record);
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
index 2082afd3..a09907f5 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
@@ -183,6 +183,8 @@ public class MaterialExtendService {
                     materialExtend.setLowDecimal(tempUpdatedJson.getBigDecimal("lowDecimal"));
                 }
                 this.updateMaterialExtend(materialExtend);
+                //如果金额为空，此处单独置空
+                materialExtendMapperEx.specialUpdatePrice(materialExtend);
             }
         }
         //处理条码的排序，基本单位排第一个
@@ -238,13 +240,13 @@ public class MaterialExtendService {
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateMaterialExtend(MaterialExtend MaterialExtend) throws Exception{
+    public int updateMaterialExtend(MaterialExtend materialExtend) throws Exception{
         User user = userService.getCurrentUser();
-        MaterialExtend.setUpdateTime(System.currentTimeMillis());
-        MaterialExtend.setUpdateSerial(user.getLoginName());
+        materialExtend.setUpdateTime(System.currentTimeMillis());
+        materialExtend.setUpdateSerial(user.getLoginName());
         int res =0;
         try{
-            res= materialExtendMapper.updateByPrimaryKeySelective(MaterialExtend);
+            res= materialExtendMapper.updateByPrimaryKeySelective(materialExtend);
         }catch(Exception e){
             JshException.writeFail(logger, e);
         }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml
index 60d623df..473a23d1 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml
@@ -65,4 +65,14 @@
         </foreach>
         )
     </update>
+
+    <update id="specialUpdatePrice" parameterType="com.jsh.erp.datasource.entities.MaterialExtend">
+        update jsh_material_extend
+        set purchase_decimal = #{purchaseDecimal,jdbcType=DECIMAL},
+            commodity_decimal = #{commodityDecimal,jdbcType=DECIMAL},
+            wholesale_decimal = #{wholesaleDecimal,jdbcType=DECIMAL},
+            low_decimal = #{lowDecimal,jdbcType=DECIMAL}
+        where id = #{id,jdbcType=BIGINT}
+        and ifnull(delete_flag,'0') !='1'
+    </update>
 </mapper>
\ No newline at end of file