From 133e9fccff97927467a2edbfec8ae1f382722fae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 27 一月 2024 16:31:38 +0800
Subject: [PATCH] # 打印物料码 文本自动换行
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 644 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 598 insertions(+), 46 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 efb7249..6e3f396 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,34 +1,31 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.*;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.SaasUtils;
-import com.zy.common.CodeRes;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.entity.Parameter;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
-import com.zy.common.model.MesCombParam;
import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.SaasLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
@@ -80,6 +77,33 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+
+ @Autowired
+ private LocCheckService locCheckService;
+
+ @Autowired
+ private OrderCheckService orderCheckService;
+
+ @Autowired
+ private OriginRuleService originRuleService;
+
+ @Autowired
+ private LocInPrintMatService locInPrintMatService;
+
+ @Autowired
+ private LocOutPrintMatService locOutPrintMatService;
+
+ @Autowired
+ private LocOwnerService locOwnerService;
+ @Autowired
+ private PlaService plaService;
+ @Autowired
+ private PlaQtyService plaQtyService;
+ @Autowired
+ private SaasLogService saasLogService;
+
@Override
@@ -119,12 +143,7 @@
combMat.setBatch("");
}
}
-
-
-
-
Date now = new Date();
-
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -170,24 +189,31 @@
// 鍏宠仈缁勬墭
} else {
for (CombParam.CombMat combMat : param.getCombMats()) {
- Integer sum = orderDetlService.sameOrderComb(param.getOrderNo(), combMat.getMatnr(),combMat.getBatch());
- OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
+ OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
if (orderDetl == null) {
throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
}
Double anfme = orderDetl.getAnfme();
- if ( anfme > (anfme - sum)) {
+ Double workQty = orderDetl.getWorkQty();
+ BigDecimal a1 = new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal b1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal c1 = new BigDecimal(combMat.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ double e1 = b1.add(c1).doubleValue();
+ BigDecimal f1 = new BigDecimal(e1).setScale(2,BigDecimal.ROUND_HALF_UP);
+ Double d1 = a1.subtract(f1).doubleValue();
+ if ( d1 < 0.0) {
throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
}
}
- Order order = orderService.selectByNo(param.getOrderNo());
- if (order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
+
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
for (CombParam.CombMat elem : param.getCombMats()) {
+ Order order = orderService.selectByNo(elem.getOrderNo());
+ if (order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
if(orderDetl == null){
@@ -201,8 +227,7 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
- detlDto.setPayment(orderDetl.getPayment());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -211,7 +236,10 @@
detlDtos.add(detlDto);
}
}
+ int i=0;
for (DetlDto detlDto : detlDtos) {
+ Order order = orderService.selectByNo(param.getCombMats().get(i).getOrderNo());
+ i++;
String uuid = String.valueOf(System.currentTimeMillis());
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -219,7 +247,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -236,8 +264,9 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+ orderService.updateSettle(order.getId(), 2L, userId);
}
- orderService.updateSettle(order.getId(), 2L, userId);
+
}
}
@@ -518,11 +547,37 @@
@Transactional
@Override
- public R manDetlIn(JSONObject json) {
+ public R manDetlIn(JSONObject json, User user) {
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
+ List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
+
+// if (node.getParentName().equals("A") || node.getParentName().equals("B")){
+// if (node.getRow1() == 1 && locDetls.size() >=11){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+// if (node.getRow1() == 6 && locDetls.size() >=4){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+// if (node.getRow1() == 12 && locDetls.size() >=4){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+//
+// }
+// if (locDetls.size() >=12){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+
+
+
JSONArray combMats = json.getJSONArray("combMats");
for (int i = 0; i < combMats.size(); i++) {
OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
@@ -564,12 +619,17 @@
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
+ manLocDetl.setStockFreeze(1);
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
- } else {
+ }
+ else {
if (checkManLocDetl.getWeight() == null){
checkManLocDetl.setWeight(0.0);
+ }
+ if (jsonOrderDetl.getWeight() == null){
+ jsonOrderDetl.setWeight(0.0);
}
if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
node.getName(),
@@ -603,7 +663,7 @@
}
orderService.checkComplete(order.getOrderNo());
- SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
+ SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
}
@@ -612,9 +672,15 @@
@Transactional
@Override
- public R manDetlOut(JSONObject json) {
+ public R manDetlOut(JSONObject json,User user) {
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
JSONArray combMats = json.getJSONArray("combMats");
@@ -638,17 +704,28 @@
EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
manPakOutEntityWrapper.eq("loc_no",jsonLocNo);
manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
+ manPakOutEntityWrapper.eq("doc_num",order.getOrderNo());
ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //鑾峰彇鎷ｈ揣鍗曚腑鐨勫搴旂殑璁㈠崟
+ if(Cools.isEmpty(manPakOut)){
+ return R.error("娌℃湁鎵惧埌瀵瑰簲鐨勫嚭搴撳崟"+jsonLocNo+"-------"+jsonOrderDetl.getMatnr());
+ }
if(manPakOut.getCount() == null){
- manPakOut.setCount(0);
+ manPakOut.setCount(0.0);
}
// if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曠殑鏁伴噺
// return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曟�绘暟閲�");
// }
- if (jsonOrderDetl.getAnfme() > (manPakOut.getAnfme()-manPakOut.getCount())) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑虹殑鏁伴噺
+ BigDecimal a1 = new BigDecimal(manPakOut.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal b1 = new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+ if (jsonOrderDetl.getAnfme() > c1) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑虹殑鏁伴噺
return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑烘暟閲�");
}
- if (orderDetl.getWorkQty() - orderDetl.getQty() <jsonOrderDetl.getAnfme() ){
+
+ BigDecimal e1 = new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal f1 = new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ Double g1 = e1.subtract(f1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+ if ( g1 <jsonOrderDetl.getAnfme() ){
return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍓╀綑鍙嚭鏁伴噺");
}
//鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙�
@@ -659,8 +736,14 @@
if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
}
- Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
- Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
+ if(checkManLocDetl.getWeight() == null){
+ checkManLocDetl.setWeight(0.0);
+ }
+ if(jsonOrderDetl.getWeight() == null){
+ jsonOrderDetl.setWeight(0.0);
+ }
+ Double finalQty = new BigDecimal(checkManLocDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() ;
+ Double weight = new BigDecimal(checkManLocDetl.getWeight()).setScale(2,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(jsonOrderDetl.getWeight()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() ;
checkManLocDetl.setAnfme(finalQty);
checkManLocDetl.setWeight(weight);
if (weight < 0){
@@ -675,7 +758,7 @@
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
}
- orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setQty( new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() );
orderDetl.setUpdateTime(date);
orderDetlService.updateById(orderDetl);
//鏇存柊璁㈠崟鐘舵��
@@ -684,7 +767,7 @@
boolean log=true;
for (OrderDetl orderDetl1: orderDetls) {
//宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
- if(orderDetl1.getQty() < orderDetl.getAnfme()){
+ if(orderDetl1.getQty() < orderDetl1.getAnfme()){
log=false;
}
}
@@ -695,13 +778,14 @@
return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
if(manPakOut.getCount() == null){
- manPakOut.setCount(0);
+ manPakOut.setCount(0.0);
}
- manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());
+
+ manPakOut.setCount(new BigDecimal(manPakOut.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP).add(new BigDecimal(jsonOrderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
return R.error("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟鐩け璐�");
}
- if (manPakOut.getAnfme().intValue() == manPakOut.getCount()){
+ if (manPakOut.getAnfme().equals(manPakOut.getCount())){
manPakOut.setStatus(1);
if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
return R.error("鏇存柊鎷ｈ揣鍗曠姸鎬佸け璐�");
@@ -710,9 +794,7 @@
EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
manLocDetlEntityWrapper.eq("loc_no",manPakOut.getLocNo());
manLocDetlEntityWrapper.eq("matnr",manPakOut.getMatnr());
- if (checkManLocDetl.getAnfme().intValue() == manPakOut.getCount()){
-
-
+ if (checkManLocDetl.getAnfme() == 0 ){
if(!manLocDetlService.delete(manLocDetlEntityWrapper)){
return R.error("鍒犻櫎骞冲簱搴撳瓨澶辫触");
}
@@ -722,9 +804,479 @@
return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
}
}
- SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
+ SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
}
return R.ok("涓嬫灦瀹屾垚");
}
+
+ @Override
+ public R manDetlInBarcode(JSONObject json, User user) {
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ String jsonBarNo = (String) json.get("barcode"); //鑾峰彇鎵樼洏鐮�
+
+ LocMast locMast = locMastService.selectLocStatus(jsonLocNo);
+ if (locMast.getLocSts().equals("X")){
+ return R.error("搴撲綅宸茶鍐荤粨");
+ }
+
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //鑾峰彇瀵瑰簲缁勬墭淇℃伅
+ if (Cools.isEmpty(waitPakins)){
+ return R.error("鏈煡璇㈠埌缁勬墭");
+ } else if (waitPakins.get(0).getIoStatus().equals("Y")) {
+ return R.error("缁勬墭宸茬粡鐢熸垚宸ヤ綔妗�");
+ }
+
+ for (WaitPakin waitPakin: waitPakins) {
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("zpallet", waitPakin.getZpallet()));
+ if (!Cools.isEmpty(manLocDetls) || manLocDetls.size()>0){
+ return R.error("鎵�鍦ㄥ簱浣嶅凡瀛樺湪鏄庣粏");
+ }
+ }
+ //鍒ゆ柇璁㈠崟鏄惁瀹屾垚
+ boolean log =true;
+
+ for (WaitPakin waitPakin: waitPakins) {
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo())); //鑾峰彇瀵瑰簲璁㈠崟淇℃伅
+ if (order.equals(null)){
+ return R.error("鏈煡璇㈠埌璁㈠崟淇℃伅");
+ }
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.
+ getOrderNo()).eq("matnr", waitPakin.getMatnr())); //鑾峰彇瀵瑰簲璁㈠崟鏄庣粏淇℃伅
+ if (orderDetl.equals(null)){
+ return R.error("鏈煡璇㈠埌璁㈠崟鏄庣粏淇℃伅");
+ }
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (node.equals(null)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+ Date date = new Date();
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(waitPakin.getAnfme());
+ manLocDetl.setMatnr(waitPakin.getMatnr());
+ manLocDetl.setMaktx(waitPakin.getMaktx());
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(date);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(date);
+ manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setStockFreeze(1);
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+ orderDetl.setQty(orderDetl.getQty()+ waitPakin.getAnfme()); //鏇存柊璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.updateById(orderDetl)){
+ return R.error("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
+
+ WaitPakinLog waitPakinLog = new WaitPakinLog(); //鍒濆鍖栧叆搴撻�氱煡鍗曟棩蹇楀疄浣撶被
+ waitPakinLog.setZpallet(waitPakin.getZpallet());
+ waitPakinLog.setAnfme(waitPakin.getAnfme());
+ waitPakinLog.setMatnr(waitPakin.getMatnr());
+ waitPakinLog.setLocNo(jsonLocNo);
+ waitPakinLog.setMaktx(waitPakin.getMaktx());
+ waitPakinLog.setOrderNo(waitPakin.getOrderNo());
+ waitPakinLog.setWeight(waitPakin.getWeight());
+ waitPakinLog.setStatus("Y");
+ waitPakinLog.setIoStatus("Y");
+ waitPakinLog.setModiUser(user.getId());
+ waitPakinLog.setModiTime(date);
+ waitPakinLog.setAppeUser(user.getId());
+ waitPakinLog.setAppeTime(date);
+ waitPakinLog.setUuid(waitPakin.getUuid());
+
+ if (!waitPakinLogService.insert(waitPakinLog)){ //鎻掑叆鍏ュ簱閫氱煡鍘嗗彶妗ｆ暟鎹簱
+ return R.error("鎻掑叆鍘嗗彶鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ //璁㈠崟鏄惁瀹屾垚
+ List<OrderDetl> or = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.getOrderNo()));
+ for (OrderDetl o: or) {
+ if(o.getAnfme()-o.getQty()>0){
+ log=false;
+ break;
+ }
+ }
+ if(log){
+ order.setSettle(4L);
+ if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo()))){
+ return R.error("璁㈠崟杞畬鎴愮姸鎬佸け璐ワ紒锛侊紒");
+ }
+ }
+ }
+
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",jsonBarNo))){ //鍒犻櫎鍘熷叆搴撻�氱煡妗�
+ return R.error("鍒犻櫎鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ return R.ok("涓婃灦鎴愬姛");
+ }
+
+ @Override
+ public R adjustNew(MobileAdjustNewParam combParam, Long userId) {
+
+
+ for (WrkDetl detl: combParam.getWrkDetls()){
+ EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
+ wrapper.eq("order_no", combParam.getOrderNo())
+ .eq("matnr", detl.getMatnr())
+ .eq("loc_no", detl.getLocNo())
+ .eq("batch",detl.getBatch());
+ LocCheck CheckDetl = locCheckService.selectOne(wrapper);
+ if (CheckDetl == null){
+ Date now = new Date();
+ LocCheck locCheck = new LocCheck();
+ locCheck.setLocNo(detl.getLocNo());
+ locCheck.setMaktx(detl.getMaktx());
+ locCheck.setType(1);
+ locCheck.setMatnr(detl.getMatnr());
+ locCheck.setAnfme(detl.getAnfme());
+ locCheck.setRealAnfme(detl.getAnfme());
+ locCheck.setDiffAnfme(detl.getAnfme());
+ locCheck.setExamine(0);
+ locCheck.setOwner(detl.getOwner());
+ locCheck.setPayment(detl.getPayment());
+ locCheck.setCreateTime(now);
+ locCheck.setUpdateTime(now);
+ locCheck.setOrderNo(combParam.getOrderNo());
+ locCheck.setBatch(detl.getBatch());
+
+ if (!locCheckService.insert(locCheck)){
+ return R.error("鐩樼偣鏄庣粏鎻掑叆澶辫触");
+ }
+ }else {
+ CheckDetl.setRealAnfme(detl.getAnfme());
+ CheckDetl.setDiffAnfme(detl.getAnfme()- CheckDetl.getAnfme());
+ if (!locCheckService.update(CheckDetl,wrapper)){
+ return R.error("鏄庣粏鏇存柊澶辫触");
+ }
+
+
+
+ }
+
+
+ }
+ 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) {
+ Date now = new Date();
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ String ownerName = (String) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", ownerName));
+ Long ownerId = locOwner.getId();
+ String jsonCode = (String) json.get("code"); //鑾峰彇鏉＄爜
+ String jsonOrigin = (String) json.get("origin"); //鑾峰彇鏉ユ簮鍦�
+ if (Cools.isEmpty(jsonLocNo)){
+ return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(ownerId)){
+ return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(jsonCode)){
+ return R.error("鏉＄爜鍙傛暟涓虹┖锛�");
+ }else if (Cools.isEmpty(jsonOrigin)){
+ return R.error("鏉ユ簮鍦板弬鏁颁负绌猴紒");
+ }
+ Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
+ OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
+ .eq("origin_address", jsonOrigin));
+
+ String code = "0";
+ String weight = "0";
+ String date = "0";
+ try{
+ if (originRule.getStartCode() != 0 && originRule.getEndCode() !=0){
+ code = jsonCode.substring(originRule.getStartCode() - 1, originRule.getEndCode());
+ }
+ if (originRule.getStartWeight() != 0 && originRule.getEndWeight() !=0){
+ weight = jsonCode.substring(originRule.getStartWeight() - 1, originRule.getEndWeight());
+ }
+ if (originRule.getStartDate() != 0 && originRule.getEndDate() !=0){
+ date = jsonCode.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("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
+
+ Mat mat = matService.selectByMatnr(jsonOriginDetl.getMatnr());
+ if (Cools.isEmpty(mat)){
+ return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
+ }
+ //澧炲姞鎵撳嵃妗ｆ
+ LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+ locInPrintMat.setOwnerId(ownerId);
+ locInPrintMatService.insert(locInPrintMat);
+
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date).eq("owner",jsonOwner);
+ ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
+ if(!Cools.isEmpty(manLocDetl1)){
+ BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal anfme = BigDecimal.valueOf(manLocDetl1.getAnfme());
+
+ BigDecimal sum = anfme.add(inAnfme);
+ manLocDetl1.setAnfme(sum.doubleValue());
+ if (!manLocDetlService.update(manLocDetl1,manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅涓婃灦澶辫触");
+ }
+
+ }else {
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.sync(mat);
+ manLocDetl.setLocNo(node.getUuid());
+ manLocDetl.setNodeId(node.getId());
+// manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
+ manLocDetl.setName(jsonCode);
+ manLocDetl.setModel(code);
+ manLocDetl.setWeight(Double.valueOf(weight));
+ manLocDetl.setBatch(date);
+ manLocDetl.setCustName(jsonOriginDetl.getOrigin());
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(now);
+ // manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setStockFreeze(1);
+ manLocDetl.setOwner(jsonOwner);
+ try {
+ Date produceTime = DateUtils.convert(manLocDetl.getBatch(),DateUtils.yyyyMMdd);
+ manLocDetl.setProduceTime(produceTime);
+ } catch (Exception e) {
+ manLocDetl.setProduceTime(now);
+ }
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+ }
+
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R manDetlOrigInNo(JSONObject json, User user) {
+ Date now = new Date();
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ String ownerName = (String) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", ownerName));
+ Long ownerId = locOwner.getId();
+ if (Cools.isEmpty(jsonLocNo)){
+ return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+ }else if (Cools.isEmpty(ownerId)){
+ return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+ }
+ Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (Cools.isEmpty(node)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
+
+ Mat mat = matService.selectByMatnr(jsonOriginDetl.getMatnr());
+ if (Cools.isEmpty(mat)){
+ return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
+ }
+ //澧炲姞鎵撳嵃妗ｆ
+ LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+ locInPrintMat.setOwnerId(ownerId);
+ locInPrintMatService.insert(locInPrintMat);
+
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch()).eq("owner",jsonOwner);
+ ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
+ if(!Cools.isEmpty(manLocDetl1)){
+ BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ BigDecimal anfme = BigDecimal.valueOf(manLocDetl1.getAnfme());
+
+ BigDecimal sum = anfme.add(inAnfme);
+ manLocDetl1.setAnfme(sum.doubleValue());
+ if (!manLocDetlService.update(manLocDetl1,manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅涓婃灦澶辫触");
+ }
+
+ }else {
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.sync(mat);
+ manLocDetl.setLocNo(node.getUuid());
+ manLocDetl.setNodeId(node.getId());
+// manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(jsonOriginDetl.getAnfme());
+ manLocDetl.setName("");
+ manLocDetl.setModel("");
+ manLocDetl.setWeight(jsonOriginDetl.getAnfme());
+ manLocDetl.setBatch(jsonOriginDetl.getBatch());
+ manLocDetl.setCustName(jsonOriginDetl.getOrigin());
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(now);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(now);
+ manLocDetl.setOwner(jsonOwner);
+ // manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setStockFreeze(1);
+ try {
+ Date produceTime = DateUtils.convert(jsonOriginDetl.getBatch(),DateUtils.yyyyMMdd);
+ manLocDetl.setProduceTime(produceTime);
+ } catch (Exception e) {
+ manLocDetl.setProduceTime(now);
+ }
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+ }
+
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R manDetlOriginOut(JSONObject json, User user) {
+ Date now = new Date();
+ JSONArray combMats = json.getJSONArray("combMats");
+ List<MatPrint> matPrintList=new ArrayList<>();
+ List<Long> ids=new ArrayList<>();
+ for (int i = 0; i < combMats.size(); i++) {
+ MatPrint matPrintNow = combMats.getObject(i, MatPrint.class);
+ if (!ids.contains(matPrintNow.getIndex())){
+ ids.add(matPrintNow.getIndex());
+ matPrintList.add(matPrintNow);
+ }
+ }
+ for (MatPrint jsonOriginDetl:matPrintList) {
+ Double parseLong = jsonOriginDetl.getAnfme();
+ Long ownerId = Long.parseLong(jsonOriginDetl.getOwner());
+ jsonOriginDetl.setOwnerId(ownerId);
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo())
+ .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch()).eq("owner",jsonOriginDetl.getOwnerId());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
+ if (Cools.isEmpty(manLocDetl)){
+ return R.error("鏈煡璇㈠埌鍟嗗搧鏄庣粏淇℃伅!搴撲綅鍙凤細"+jsonOriginDetl.getLocNo()+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch()+"璐т富"+jsonOriginDetl.getOwnerId());
+ }
+ BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
+ BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
+
+ if (manLocDetl.getAnfme() > parseLong){
+ BigDecimal num = anfme.subtract(outAnfme);
+ manLocDetl.setAnfme(num.doubleValue());
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(now);
+ if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅涓嬫灦澶辫触");
+ }
+
+ }else if (manLocDetl.getAnfme().equals(jsonOriginDetl.getAnfme())) {
+ if (!manLocDetlService.delete(manLocDetlWrapper)) {
+ return R.error("鐗╂枡淇℃伅鍒犻櫎澶辫触");
+ }
+ }
+ }
+ for (MatPrint jsonOriginDetl:matPrintList) {
+ //澧炲姞鎵撳嵃妗ｆ
+ LocOutPrintMat locOutPrintMat = new LocOutPrintMat(now, user.getId(), jsonOriginDetl.getMatnr(), jsonOriginDetl.getBatch(), jsonOriginDetl.getAnfme(), jsonOriginDetl.getLocNo(), jsonOriginDetl.getMaktx());
+ locOutPrintMat.setOwnerId(jsonOriginDetl.getOwnerId());
+ locOutPrintMatService.insert(locOutPrintMat);
+ }
+ return R.ok();
+ }
+
+ @Override
+ public void plaPakin(String locNo, String batch, String packageNo,User user) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ if(Cools.isEmpty(pla)){
+ throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
+ }
+
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
+ }
+
+ pla.setStatus(GlobleParameter.PLA_STATUS_1);
+ pla.setModifyTime(new Date());
+ pla.setPakinTime(new Date());
+
+ Node node = nodeService.selectByUuid(locNo);
+ if(Cools.isEmpty(node)){
+ throw new CoolException("搴撲綅淇℃伅涓嶆纭�");
+ }
+
+ pla.setStash(node.getParentName());
+ pla.setLocNo(node.getUuid());
+
+ plaService.updateById(pla);
+ SaasUtils.insertLog(0,locNo,batch+","+packageNo,pla.getWeightAnfme(),user.getUsername());
+ }
+
+ @Override
+ @Transactional
+ public void plaPakout(String locNo, String batch, String packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+
+ ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
+
+ PlaQty plaQty = plaQtyService.selectById(orderDetlId);
+
+ //鏇存柊鎷ｈ揣鍗曚俊鎭�
+ if(manPakOut.getCount() + anfme > manPakOut.getAnfme()){
+ throw new CoolException("鎷ｈ揣閲嶉噺澶т簬鎷ｈ揣鍗曟墍闇�鎷ｈ揣閲嶉噺锛岃閲嶆柊鍒嗛厤鎷ｈ揣閲嶉噺");
+ }
+ if(manPakOut.getStatus() == 1){
+ throw new CoolException("璇ユ嫞鏂欏崟宸插嚭搴�");
+ }
+ manPakOut.setCount(manPakOut.getCount() + anfme);
+ if (manPakOut.getAnfme().equals(manPakOut.getCount())){
+ manPakOut.setStatus(1);
+ manPakOutService.updateById(manPakOut);
+ }
+
+ //鏇存柊plaQty淇℃伅
+ plaQty.setPakoutTime(Utils.getDateStr(new Date()));
+ plaQtyService.updateById(plaQty);
+
+ //鏇存柊pla鏄庣粏
+ pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
+ pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
+ pla.setModifyTime(new Date());
+ if(pla.getWeightAnfme() <= 0){
+ pla.setStatus(GlobleParameter.PLA_STATUS_4);
+ }else {
+ pla.setStatus(GlobleParameter.PLA_STATUS_3);
+ }
+ plaService.updateById(pla);
+ SaasUtils.insertLog(1,locNo,batch+","+packageNo,anfme,null);
+
+ //鏇存柊璁㈠崟鏄庣粏
+ Order order = orderService.selectByNo(orderNo);
+ OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
+
+ orderDetl.setQty(orderDetl.getQty() + anfme);
+ orderDetlService.updateById(orderDetl);
+
+ orderService.checkComplete(orderNo);
+
+ }
}
--
Gitblit v1.9.1