From bd6095e7af86faf7ed0a5ca188775aeac7b031f2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 09:40:55 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index a316a07..b89302d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -115,6 +115,9 @@
/**
* 鎺х
*/
+ if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
+ item.setHostId(1L);
+ }
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
@@ -135,11 +138,10 @@
throw new CoolException("璇烽�夋嫨瀹㈡埛");
}
Cstmr cstmr = cstmrService.selectOne(new EntityWrapper<Cstmr>()
- .eq("id",Long.parseLong(item.getUuid())));
+ .eq("id",Long.parseLong(item.getCstmrUuid())));
if (Cools.isEmpty(cstmr)) {
throw new CoolException("鎵句笉鍒拌瀹㈡埛,璇锋鏌�");
}
-
item.setCustMan(cstmr.getName());
item.setCustMobile(cstmr.getTel());
item.setCustAdress(cstmr.getAddr());
@@ -161,6 +163,7 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
+
// item.setType("1");
// if (!item.getType().equals("1")) {
// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
--
Gitblit v1.9.1