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 | 509 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 454 insertions(+), 55 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 a7b95e6..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,38 +1,35 @@
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.sun.org.apache.xpath.internal.operations.Or;
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.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -82,6 +79,30 @@
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;
@@ -206,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;
@@ -531,25 +551,30 @@
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("璇ュ簱浣嶆帓宸叉弧");
- }
+// 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("璇ュ簱浣嶆帓宸叉弧");
+// }
@@ -578,8 +603,8 @@
return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
}
//鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
-// ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
-// if (checkManLocDetl == null) {
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (checkManLocDetl == null) {
ManLocDetl manLocDetl = new ManLocDetl();
Synchro.Copy(orderDetl, manLocDetl);
@@ -594,27 +619,28 @@
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
+ manLocDetl.setStockFreeze(1);
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
-// }
-// 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(),
-// jsonOrderDetl.getMatnr(),
-// jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
-// )<=0
-// ){
-// return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
-// }
-//
-// }
+ }
+ 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(),
+ jsonOrderDetl.getMatnr(),
+ jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
+ )<=0
+ ){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+
+ }
orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
orderDetl.setUpdateTime(date);
@@ -649,6 +675,12 @@
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");
@@ -783,6 +815,11 @@
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("鏈煡璇㈠埌缁勬墭");
@@ -827,8 +864,7 @@
manLocDetl.setUpdateBy(user.getId());
manLocDetl.setModiTime(date);
manLocDetl.setOrderNo(waitPakin.getOrderNo());
- manLocDetl.setOwner(waitPakin.getOwner());
- manLocDetl.setPayment(waitPakin.getPayment());
+ manLocDetl.setStockFreeze(1);
if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -852,8 +888,6 @@
waitPakinLog.setModiTime(date);
waitPakinLog.setAppeUser(user.getId());
waitPakinLog.setAppeTime(date);
- waitPakinLog.setOwner(waitPakin.getOwner());
- waitPakinLog.setPayment(waitPakin.getPayment());
waitPakinLog.setUuid(waitPakin.getUuid());
if (!waitPakinLogService.insert(waitPakinLog)){ //鎻掑叆鍏ュ簱閫氱煡鍘嗗彶妗ｆ暟鎹簱
@@ -880,4 +914,369 @@
}
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