From c26270ef459e2ccf15bb019a05ac6d3934e2ad57 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 一月 2024 12:35:55 +0800
Subject: [PATCH] # 拣货单删除功能
---
src/main/webapp/views/home/navigation.html | 8 ++--
src/main/webapp/static/js/pla/plaDetl.js | 16 ++++----
src/main/java/com/zy/asrs/controller/MobileController.java | 2
src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java | 51 +++++++++++++++++--------
4 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d35ff5a..14228b3 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -420,7 +420,7 @@
}
@RequestMapping("/plaDetl/packin/v1")
- @ManagerAuth(memo="pla鍏ュ簱")
+ //@ManagerAuth(memo="pla鍏ュ簱")
public R plaPackIn(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
String batch = json.get("batch").toString();
diff --git a/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
index d359763..895493e 100644
--- a/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
@@ -1,18 +1,16 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.mapper.PakoutMapper;
-import com.zy.asrs.entity.Pakout;
-import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.GlobleParameter;
+import com.zy.asrs.mapper.PakoutMapper;
+import com.zy.asrs.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@Service("pakoutService")
@@ -25,6 +23,12 @@
@Autowired
private ManLocDetlService manLocDetlService;
+
+ @Autowired
+ private PlaService plaService;
+
+ @Autowired
+ private PlaQtyService plaQtyService;
@Override
public void deletePakout(String docNum) {
@@ -49,16 +53,29 @@
throw new RuntimeException("璁㈠崟鏄庣粏鎵归噺鏇存柊澶辫触");
}
- List<Pakout> pakouts = selectList(new EntityWrapper<Pakout>().eq("doc_num", docNum));
+ List<Pakout> pakouts = selectList(new EntityWrapper<Pakout>().eq("doc_num", docNum));
for (Pakout pakout: pakouts){
- ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", pakout.getLocNo())
- .eq("matnr", pakout.getMatnr()));
- manLocDetl.setStatus(1);
- if (!manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
- .eq("loc_no", pakout.getLocNo())
- .eq("matnr", pakout.getMatnr()))){
- throw new RuntimeException("搴撳瓨鐘舵�佹洿鏂板け璐�");
+
+ Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), pakout.getBarcode());
+ if(!Cools.isEmpty(pla)){
+ pla.setQtyAnfme(pla.getQtyAnfme() - pakout.getAnfme());
+ pla.setModifyTime(new Date());
+ if(pla.getQtyAnfme() <= 0){
+ pla.setStatus(GlobleParameter.PLA_STATUS_1);
+ }
+ plaService.updateById(pla);
+ plaQtyService.deleteById(pakout.getNodeId());
+
+ }else {
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", pakout.getLocNo())
+ .eq("matnr", pakout.getMatnr()));
+ manLocDetl.setStatus(1);
+ if (!manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", pakout.getLocNo())
+ .eq("matnr", pakout.getMatnr()))){
+ throw new RuntimeException("搴撳瓨鐘舵�佹洿鏂板け璐�");
+ }
}
}
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 6cc242c..48be961 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -51,14 +51,14 @@
,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true}
,{field: 'status', align: 'center',title: '鐘舵��', templet: setState ,edit:true}
,{align: 'center', title: '娴佽浆鏄庣粏', toolbar: '#tbLook'}
- ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
- ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
- ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
- ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
- ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
- ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
- ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
+ // ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
+ // ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
+ // ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
+ // ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
+ // ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
+ // ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
+ // ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
];
return cols;
}
diff --git a/src/main/webapp/views/home/navigation.html b/src/main/webapp/views/home/navigation.html
index 64ce2a6..fbb13ff 100644
--- a/src/main/webapp/views/home/navigation.html
+++ b/src/main/webapp/views/home/navigation.html
@@ -121,11 +121,11 @@
<a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">
<p>鍗曟嵁绠＄悊</p>
</a>
- <a class="list fn_2 moveUpDownFla2" ew-href="wrkMast/wrkMast.html?resourceId=214">
- <p>杩愯浠诲姟</p>
+ <a class="list fn_2 moveUpDownFla2" ew-href="pla/plaDetl.html?resourceId=214">
+ <p>鑱氫钩閰告槑缁嗙鐞�</p>
</a>
- <a class="list fn_3 moveUpDownFla1" ew-href="stoMan/stoQue.html?resourceId=10276">
- <p>搴撳瓨鏄庣粏</p>
+ <a class="list fn_3 moveUpDownFla1" ew-href="picking/picking.html?resourceId=10276">
+ <p>鎷ｆ枡鍗曠鐞�</p>
</a>
</div>
--
Gitblit v1.9.1