From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 297 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 248 insertions(+), 49 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 bb73f24..56ac370 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,35 +1,37 @@
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.*;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustNewParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OffSaleParam;
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.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;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -88,6 +90,21 @@
@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;
@@ -957,34 +974,62 @@
@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++) {
- 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("鏉＄爜浣嶇疆鏈夎");
+ OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
+
+ Mat mat = matService.selectByMatnr(jsonOriginDetl.getMatnr());
+ if (Cools.isEmpty(mat)){
+ return R.error("鏈煡璇㈠埌鍟嗗搧淇℃伅");
}
- Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
- if (Cools.isEmpty(node)){
- return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
- }
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
+ //澧炲姞鎵撳嵃妗ｆ
+ 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());
@@ -997,16 +1042,16 @@
}
}else {
- Date now = new Date();
ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
- manLocDetl.setLocNo(node.getName());
+ manLocDetl.sync(mat);
+ manLocDetl.setLocNo(node.getUuid());
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.setName(jsonCode);
+ manLocDetl.setModel(code);
+ manLocDetl.setWeight(Double.valueOf(weight));
+ manLocDetl.setBatch(date);
manLocDetl.setCustName(jsonOriginDetl.getOrigin());
manLocDetl.setStatus(1);
manLocDetl.setCreateBy(user.getId());
@@ -1015,6 +1060,13 @@
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("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -1026,22 +1078,115 @@
}
@Override
- public R manDetlOriginOut(JSONObject json, User user) {
+ 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++) {
- DetlOriginDTO jsonOriginDetl = combMats.getObject(i, DetlOriginDTO.class);
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr());
+ 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);
- BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+ 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() > jsonOriginDetl.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("鐗╂枡淇℃伅涓嬫灦澶辫触");
}
@@ -1051,9 +1196,63 @@
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) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ if(!pla.getLocNo().equals(locNo)){
+ throw new CoolException("璇ョ墿鏂欏叆搴撶殑搴撲綅閿欒");
+ }
+ if("宸插叆搴�".equals(pla.getStatus())){
+ throw new CoolException("璇ョ墿鏂欏凡鍏ュ簱");
+ }
+ pla.setStatus("宸插叆搴�");
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+ SaasUtils.insertLog(0,locNo,batch+","+packageNo,pla.getWeightAnfme(),null);
+ }
+
+ @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);
+ }
+
+ //鏇存柊pla鏄庣粏
+ pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
+ pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
+ if(pla.getWeightAnfme() <= 0){
+ pla.setStatus("鍏ㄩ儴鍑哄簱");
+ }else {
+ pla.setStatus("閮ㄥ垎鍑哄簱");
+ }
+ plaService.updateById(pla);
+ SaasUtils.insertLog(1,locNo,batch+","+packageNo,anfme,null);
+
+ }
}
--
Gitblit v1.9.1