From 9726c47d31fdf894fa6b5188940d90b47a3f5e30 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Mon, 18 Nov 2024 23:27:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5excel=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=88=87=E6=8D=A2=E5=A4=9A=E4=B8=AA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E9=81=87=E5=88=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/material/MaterialService.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 1adcab2b9..00145dd47 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -716,6 +716,7 @@ public class MaterialService {
                     Long unitId = unitService.getUnitIdByParam(unit, manyUnit, new BigDecimal(ratio.trim()));
                     if(unitId != null) {
                         m.setUnitId(unitId);
+                        m.setUnit("");
                     } else {
                         throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_UNIT_MATE_CODE,
                                 String.format(ExceptionConstants.MATERIAL_UNIT_MATE_MSG, manyBarCode));
@@ -730,6 +731,7 @@ public class MaterialService {
                     materialExObj.put("other", otherObj);
                 } else {
                     m.setUnit(unit);
+                    m.setUnitId(null);
                 }
                 m.setMaterialExObj(materialExObj);
                 m.setEnabled("1".equals(enabled));
@@ -771,6 +773,14 @@ public class MaterialService {
                     Material material = JSONObject.parseObject(materialJson, Material.class);
                     material.setId(mId);
                     materialMapper.updateByPrimaryKeySelective(material);
+                    //更新多单位
+                    if(material.getUnitId() == null) {
+                        materialMapperEx.setUnitIdToNull(material.getId());
+                    }
+                    //如果之前有保质期，则更新保质期
+                    if(materials.get(0).getExpiryNum()!=null && material.getExpiryNum() == null) {
+                        materialMapperEx.setExpiryNumToNull(material.getId());
+                    }
                 }
                 //给商品新增或更新条码与价格相关信息
                 JSONObject materialExObj = m.getMaterialExObj();