From b55b2670e438ec149791c03627926c6825372825 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 09:22:21 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java | 6 +++---
src/main/webapp/views/custOrder/custOrder.html | 9 ++++++---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
3 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
index 27b6c23..2de633b 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
@@ -69,7 +69,7 @@
/**
* 鐘舵�� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父
*/
- @ApiModelProperty(value= "鐘舵�� 0: 杞藉叆涓� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 杞藉叆涓� 1: 寰呭鐞� 2: 鏈嫞璐� 3: 鍙栨秷 4: 宸插畬鎴� ")
private Integer status;
/**
@@ -200,11 +200,11 @@
case 1:
return "寰呭鐞�";
case 2:
- return "宸插畬鎴�";
+ return "鏈嫞璐�";
case 3:
return "鍙栨秷";
case 4:
- return "寮傚父";
+ return "宸插畬鎴�";
default:
return String.valueOf(this.status);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 3a89934..99f2ab3 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -129,7 +129,10 @@
return R.error("淇濆瓨鏁版嵁澶辫触");
}
// todo锛氫慨鏀瑰簱瀛樻暟閲�
-
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
return R.ok();
}
@@ -173,10 +176,27 @@
}
@Override
+ @Transactional
public R completePakout(String wrkNo, Long userId) {
Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
if (null != pakout) {
if (pakoutService.stockOutComplete(wrkNo, null, userId)) {
+
+ boolean complete = true;
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
+ for (Pakout item : pakouts) {
+ if (item.getWrkSts() != 3) {
+ complete = false;
+ break;
+ }
+ }
+ if (complete) {
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+
return R.ok("鎷ｈ揣鍗曞凡瀹屾垚");
}
}
@@ -210,6 +230,15 @@
if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
throw new CoolException("鍒犻櫎鎷ｈ揣鍗曞け璐�");
}
+
+ // 鍙栨秷閿�鍞鍗�
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
+ if (Cools.isEmpty(pakouts)){
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(pakout.getDocNum(), 3)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
}
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 08e3988..01afb39 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -29,8 +29,9 @@
<select name="status">
<option value="" style="display: none">閫夋嫨鐘舵��</option>
<option value="1">寰呭鐞�</option>
- <option value="2">宸插畬鎴�</option>
+ <option value="2">鏈嫞璐�</option>
<option value="3">鍙栨秷</option>
+ <option value="3">宸插畬鎴�</option>
</select>
</div>
</div>
@@ -68,9 +69,11 @@
{{# if( d.status === 1){ }}
class="layui-badge layui-badge-blue"
{{# } else if(d.status === 2){ }}
- class="layui-badge layui-badge-green"
- {{# } else if(d.status === 3){ }}
class="layui-badge layui-badge-red"
+ {{# } else if(d.status === 3){ }}
+ class="layui-badge layui-badge-gray"
+ {{# } else if(d.status === 4){ }}
+ class="layui-badge layui-badge-green"
{{# } }}
>{{d.status$}}</span>
</script>
--
Gitblit v1.9.1