From 176fee63e2fd4eb021f83d7c300b881c61b6f1d7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 15:10:20 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 b89302d..b654267 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -115,9 +115,7 @@
/**
* 鎺х
*/
- if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
- item.setHostId(1L);
- }
+
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
@@ -145,7 +143,11 @@
item.setCustMan(cstmr.getName());
item.setCustMobile(cstmr.getTel());
item.setCustAdress(cstmr.getAddr());
- item.setHostId(getHostId());
+ if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
+ item.setHostId(1L);
+ }else {
+ item.setHostId(getHostId());
+ }
item.setCreateBy(getUserId());
item.setCreateTime(new Date());
item.setStatus(1);
@@ -172,12 +174,17 @@
// if (item.getRealMonth() < 0){
// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
// }
- if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
- item.setStartTime(newitem.getStartTime());
- item.setEndTime(newitem.getEndTime());
- item.setRealEndTime(newitem.getRealEndTime());
- item.setRealStartTime(newitem.getRealStartTime());
- }
+
+
+ //鈫撯啌鈫撳啓杩欐浠ｇ爜鐨勭湡璇ユ娊澶у槾宸村瓙
+// if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
+// item.setStartTime(newitem.getStartTime());
+// item.setEndTime(newitem.getEndTime());
+// item.setRealEndTime(newitem.getRealEndTime());
+// item.setRealStartTime(newitem.getRealStartTime());
+// }
+
+
//瓒呭嚭杩愯垂
if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
--
Gitblit v1.9.1