From ceed56137f8165ff9ac3ce473385572d4c9c80d2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 十一月 2023 14:37:56 +0800
Subject: [PATCH] #平库上架
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2cc459f..26928ec 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -83,6 +83,12 @@
@Autowired
private LocCheckService locCheckService;
+ @Autowired
+ private OrderCheckService orderCheckService;
+
+ @Autowired
+ private OriginRuleService originRuleService;
+
@Override
@@ -902,7 +908,8 @@
EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", combParam.getOrderNo())
.eq("matnr", detl.getMatnr())
- .eq("loc_no", detl.getLocNo());
+ .eq("loc_no", detl.getLocNo())
+ .eq("batch",detl.getBatch());
LocCheck CheckDetl = locCheckService.selectOne(wrapper);
if (CheckDetl == null){
Date now = new Date();
@@ -920,6 +927,7 @@
locCheck.setCreateTime(now);
locCheck.setUpdateTime(now);
locCheck.setOrderNo(combParam.getOrderNo());
+ locCheck.setBatch(detl.getBatch());
if (!locCheckService.insert(locCheck)){
return R.error("鐩樼偣鏄庣粏鎻掑叆澶辫触");
@@ -937,7 +945,73 @@
}
+ OrderCheck orderCheck = orderCheckService.selectOne(new EntityWrapper<OrderCheck>().eq("order_no", combParam.getOrderNo()));
+ orderCheck.setSettle(2L);
+ if (!orderCheckService.update(orderCheck,new EntityWrapper<OrderCheck>().eq("order_no", combParam.getOrderNo()))){
+ return R.error("鏇存柊鐩樼偣鍗曠姸鎬佸け璐ワ紒");
+ }
+
return R.ok("鐩樼偣鎴愬姛");
}
+
+ @Override
+ public R manDetlOrigin(JSONObject json, User user) {
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ DetlOriginDTO jsonOriginDetl = combMats.getObject(i, DetlOriginDTO.class);
+ OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
+ .eq("origin_address", jsonOriginDetl.getOrigin()));
+ String code = "0";
+ String weight = "0";
+ String date = "0";
+ try{
+ if (originRule.getStartCode() != 0 && originRule.getEndCode() !=0){
+ code = jsonOriginDetl.getMatnr().substring(originRule.getStartCode() - 1, originRule.getEndCode());
+ }
+ if (originRule.getStartWeight() != 0 && originRule.getEndWeight() !=0){
+ weight = jsonOriginDetl.getMatnr().substring(originRule.getStartWeight() - 1, originRule.getEndWeight());
+ }
+ if (originRule.getStartDate() != 0 && originRule.getEndDate() !=0){
+ date = jsonOriginDetl.getMatnr().substring(originRule.getStartDate() - 1, originRule.getEndDate());
+ }
+ }catch (Exception e){
+ return R.error("鏉＄爜浣嶇疆鏈夎");
+ }
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (Cools.isEmpty(node)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+ Date now = new Date();
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+// manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
+ manLocDetl.setMatnr(jsonOriginDetl.getMatnr());
+ manLocDetl.setMaktx(code);
+ manLocDetl.setWeight(Double.valueOf( weight));
+ manLocDetl.setUnit(date);
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(now);
+ // manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setStockFreeze(1);
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+
+
+
+
+
+
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.9.1