From d2adac4e369165ec523c23e7ffd19fc5775d43b5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 11 四月 2022 08:14:14 +0800
Subject: [PATCH] Changes
---
src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index 10bc7c4..d4335cb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -40,7 +40,7 @@
return R.ok(receiveDetlService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/receiveDetl/list/auth")
+ @RequestMapping(value ="/receiveDetl/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -48,10 +48,11 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<ReceiveDetl> wrapper = new EntityWrapper<>();
+ param.values();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper.orderBy("id",false)));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -141,7 +142,7 @@
/**
* 鎺х涓庢暟鎹垵濮嬪寲
*/
- if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getBatch(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
+ if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
return R.error("杈撳叆鏁版嵁鏈夎,璇烽噸鏂拌緭鍏�");
}
Date date = new Date();
@@ -153,8 +154,6 @@
}
Node targetLoc = nodeService.selectOne(new EntityWrapper<Node>()
.eq("id", putShelfDTO.getSelect()));
-
-
/**
* 鏇存柊搴撳瓨
*/
@@ -190,10 +189,43 @@
ReceiveDetl targetRece = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>()
.eq("id", putShelfDTO.getId()));
- targetRece.setInQty((int) (targetRece.getInQty() + remain));
+ targetRece.setInQty((targetRece.getInQty() + remain));
receiveDetlService.update(targetRece,new EntityWrapper<ReceiveDetl>()
.eq("id",targetRece.getId()));
+ /**
+ * 鍙嶅啓璁㈠崟鐘舵��
+ */
+ if(!Cools.isEmpty(putShelfDTO.getOrderNo())){
+ List<ReceiveDetl> list = receiveDetlService.selectList(new EntityWrapper<ReceiveDetl>().eq("order_no",putShelfDTO.getOrderNo()));
+ boolean flag = true;
+ if(list.size()>0){
+ for (ReceiveDetl receiveDetl : list){
+ if(receiveDetl.getInQty() < receiveDetl.getCount()){
+ flag = false;
+ break;
+ }
+ }
+ }
+
+ if(flag){
+ Receive receive = receiveService.selectOne(new EntityWrapper<Receive>().eq("order_no",putShelfDTO.getOrderNo()));
+ receive.setSettle(Long.valueOf(4));
+ receiveService.updateById(receive);
+ }
+// ReceiveDetl receiveDetl = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>().eq("order_no",putShelfDTO.getOrderNo()).eq("matnr",putShelfDTO.getMatnr()));
+// for(int i=0;i<list.size();i++){
+// if(list.get(i).getMatnr().equals(receiveDetl.getMatnr())){
+// if(list.get(i).getInQty()>=list.get(i).getCount()){
+// Receive receive = receiveService.selectOne(new EntityWrapper<Receive>().eq("order_no",putShelfDTO.getOrderNo()));
+// receive.setSettle(Long.valueOf(4));
+// receiveService.updateById(receive);
+// break;
+// }
+// }
+// }
+
+ }
/**
* 涓婃灦瀹屾垚涔嬪悗,瀛樻斁鏁版嵁鑷充笂鏋剁粺璁¤〃 man_receive_log
*/
@@ -241,7 +273,7 @@
.eq("matnr", receiveDetl.getMatnr())
.eq("batch", receiveDetl.getBatch())
.eq("io_type", 1));
- if (!Cools.isEmpty(receiveLogs)) {
+ if (Cools.isEmpty(receiveLogs)) {
return R.error("鎵句笉鍒板叆搴撹褰�");
}
for (ReceiveLog receiveLog : receiveLogs) {
@@ -258,14 +290,11 @@
/**
* 鍙嶅啓鍥炲叆搴撴。
*/
- receiveDetl.setInQty(0);
+ receiveDetl.setInQty(0.0);
receiveDetl.setUpdateTime(new Date());
receiveDetl.setUpdateBy(getUserId());
receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
.eq("id",receiveDetl.getId()));
-
-
-
return R.ok("鎾ゅ洖鎴愬姛");
}
--
Gitblit v1.9.1