From 064aab69930245b3bfaf2a603ee8f8ada1e6b012 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Tue, 2 Apr 2024 11:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AF=BC=E5=85=A5=E8=B5=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../md/controller/MdGoodsController.java      | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zzjee/md/controller/MdGoodsController.java b/src/main/java/com/zzjee/md/controller/MdGoodsController.java
index 99c157d2..075e4d3c 100644
--- a/src/main/java/com/zzjee/md/controller/MdGoodsController.java
+++ b/src/main/java/com/zzjee/md/controller/MdGoodsController.java
@@ -213,6 +213,9 @@ public class MdGoodsController extends BaseController {
 		try {
 			if(StringUtil.isEmpty(mdGoods.getChlKongZhi()) ){
 				mdGoods.setChlKongZhi("N");
+
+			}
+			if(StringUtil.isEmpty(mdGoods.getChlShl())){
 				mdGoods.setChlShl("1");
 				mdGoods.setJshDanWei(mdGoods.getShlDanWei());
 			}
@@ -424,7 +427,19 @@ public class MdGoodsController extends BaseController {
 								}
 							}
 
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+						try{
 
+							if(StringUtil.isEmpty(mdGoods.getChlKongZhi()) ){
+								mdGoods.setChlKongZhi("N");
+
+							}
+							if(StringUtil.isEmpty(mdGoods.getChlShl())){
+								mdGoods.setChlShl("1");
+								mdGoods.setJshDanWei(mdGoods.getShlDanWei());
+							}
 							if(StringUtil.isEmpty(mdGoods.getZhlKgm())){
 								if(!StringUtil.isEmpty(mdGoods.getBzhiQi())){
 									int bzhiq = Integer.parseInt(mdGoods.getBzhiQi());
@@ -432,18 +447,7 @@ public class MdGoodsController extends BaseController {
 								}
 
 							}
-							if(StringUtil.isEmpty(mdGoods.getChlKongZhi()) ){
-								mdGoods.setChlKongZhi("N");
-
-							}
-							if("N".equals(mdGoods.getChlKongZhi())){
-								mdGoods.setChlShl("1");
-								mdGoods.setJshDanWei(mdGoods.getShlDanWei());
-
-							}
-
-						} catch (Exception e) {
-							// TODO: handle exception
+						}catch (Exception e){
 							e.printStackTrace();
 						}
 						mdGoodsService.save(mdGoods);