From f4f3c04ba37cec6739370c4aa0b9622493de8a23 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/java/zy/cloud/wms/manager/controller/PickoutController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
index a25878a..73b270d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
@@ -6,10 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import zy.cloud.wms.manager.entity.Pickout;
-import zy.cloud.wms.manager.entity.PickoutDetl;
-import zy.cloud.wms.manager.service.PickoutDetlService;
-import zy.cloud.wms.manager.service.PickoutService;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,6 +25,14 @@
private PickoutService pickoutService;
@Autowired
private PickoutDetlService pickoutDetlService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private WaveDetlService waveDetlService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@RequestMapping(value = "/pickout/{id}/auth")
@ManagerAuth
@@ -44,7 +50,8 @@
EntityWrapper<Pickout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("wrk_sts",true);
Page<Pickout> pickoutPage = pickoutService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok(pickoutPage);
@@ -131,4 +138,82 @@
return R.ok();
}
+ /**
+ * 鎵撳嵃瀹屾垚涔嬪悗,灏�'鏈墦鍗�'鐘舵�佹浛鎹负'鎷ｈ揣涓�'
+ * @param pickout
+ * @return
+ */
+ @RequestMapping("/pickout/print/auth")
+ @ManagerAuth
+ public R printed(@RequestBody Pickout pickout){
+ /**
+ * 鎵撳嵃瀹屾垚,鍚戝悗鍙版洿鏂版暟鎹�
+ */
+ Date now = new Date();
+ pickout.setPrintTimes(pickout.getPrintTimes() + 1);
+ pickout.setUpdateTime(now);
+ pickout.setUpdateBy(getUserId().intValue());
+ pickout.setPickStaff(getUserId());
+ pickout.setPickStart(now);
+ pickout.setWrkSts(2L);
+ pickoutService.update(pickout,new EntityWrapper<Pickout>()
+ .eq("id",pickout.getId()));
+ return R.ok();
+ }
+
+ /**
+ * 鐐瑰嚮瀹屾垚鎸夐挳鏃�,灏嗙姸鎬佷粠'鎷ｈ揣涓�'璋冩暣鑷�'宸插畬鎴�'
+ */
+ @RequestMapping("/pickout/done/auth")
+ @ManagerAuth
+ public R donePickOut(@RequestBody Pickout pickout){
+ HashSet<String> orderNos = new HashSet<>();
+ /**
+ * 鍙嶅啓鎷ｈ揣鍗�
+ */
+ pickout.setWrkSts(3L);
+ pickout.setPickEnd(new Date());
+ pickoutService.update(pickout,new EntityWrapper<Pickout>()
+ .eq("id",pickout.getId()));
+ List<PickoutDetl> pickoutDetls = pickoutDetlService.selectList(new EntityWrapper<PickoutDetl>()
+ .eq("head_id", pickout.getId()));
+ if (Cools.isEmpty(pickoutDetls)) {
+ return R.error("鎵句笉鍒版嫞璐у崟鏄庣粏");
+ }
+ /**
+ * 鍙嶅啓娉㈡
+ */
+ Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
+ .eq("wave_no", pickout.getWaveNo()));
+ if (Cools.isEmpty(wave)) {
+ return R.error("鎵句笉鍒板搴旀尝娆�");
+ }
+ wave.setStatus((short) 2);
+ waveService.update(wave,new EntityWrapper<Wave>()
+ .eq("id",wave.getId()));
+ List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
+ .eq("wave_id", wave.getId()));
+ if (Cools.isEmpty(waveDetls)) {
+ return R.error("鎵句笉鍒板搴旀尝娆℃槑缁�");
+ }
+
+ /**
+ * 鍙嶅啓鍑哄簱璁㈠崟
+ */
+ for (WaveDetl waveDetl : waveDetls) {
+ String[] split = waveDetl.getOrderNos().split(",");
+ for (String s : split) {
+ orderNos.add(s);
+ }
+ }
+ for (PickoutDetl pickoutDetl : pickoutDetls) {
+ Double anfme = pickoutDetl.getAnfme();
+ String matnr = pickoutDetl.getMatnr();
+ List<OrderDetl> orderDetls = orderDetlService.selectOutList(matnr,new ArrayList<String>(orderNos));
+
+ }
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1