From 5bc7091e58978baea6537ca68a6afef5c22f31e7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 一月 2024 08:19:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 196 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 182 insertions(+), 14 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 d7425fb..20e0152 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,6 +1,7 @@
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;
@@ -21,6 +22,7 @@
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -77,8 +79,10 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
-
-
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
public void comb(CombParam param, Long userId) {
@@ -115,7 +119,7 @@
Date now = new Date();
// 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
@@ -133,11 +137,16 @@
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ waitPakin.sync(matV2);
+ } else {
+ waitPakin.sync(mat);
+ }
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -153,13 +162,20 @@
}
// 鍏宠仈缁勬墭
} else {
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- Order order = orderService.selectByNo(param.getOrderNo());
- if (order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
for (CombParam.CombMat combMat : param.getCombMats()) {
- OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ Order order = orderService.selectByNo(combMat.getOrderNo());
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakin()!=1 || docType.getStatus()!=1){
+ throw new CoolException("璁㈠崟涓哄嚭搴撹鍗曪紝涓嶈兘缁勬墭锛�");
+ }
+
+ if (order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
if (orderDetl == null) {
throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
}
@@ -198,8 +214,9 @@
// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
// } else {
// }
+ orderService.updateSettle(order.getId(), 2L, userId);
}
- orderService.updateSettle(order.getId(), 2L, userId);
+
}
}
@@ -632,4 +649,155 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+
+ @Transactional
+ @Override
+ public R manDetlIn(JSONObject json) {
+ Date date = new Date();
+ String jsonLocNo = (String) json.get("locNo");
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("name", jsonLocNo));
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
+
+ //鏌ヨ鍗�
+ Order order = orderService.selectOne(new EntityWrapper<Order>()
+ .eq("order_no", jsonOrderDetl.getOrderNo()));
+ if (Cools.isEmpty(node, order)) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakin()!=1 || docType.getStatus()!=1){
+ return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+ }
+ if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
+ return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
+ }
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (checkManLocDetl == null) {
+ ManLocDetl manLocDetl = new ManLocDetl();
+ Synchro.Copy(orderDetl, manLocDetl);
+ manLocDetl.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setMatnr(orderDetl.getMatnr());
+ manLocDetl.setMaktx(jsonOrderDetl.getMaktx());
+ manLocDetl.setAnfme(jsonOrderDetl.getAnfme());
+ manLocDetl.setModiTime(date);
+ manLocDetl.setCreateTime(date);
+ manLocDetl.setBatch(jsonOrderDetl.getBatch());
+ if(!manLocDetlService.insert(manLocDetl)){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ } else {
+ if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(), jsonOrderDetl.getOrderNo(), jsonOrderDetl.getMaktx(), jsonOrderDetl.getBatch())<=0){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ }
+ orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setUpdateTime(date);
+ orderDetlService.updateById(orderDetl);
+ //鏇存柊璁㈠崟鐘舵��
+ List<OrderDetl> orderDetls=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
+ order.setSettle(2L);
+ boolean log=true;
+ for (OrderDetl orderDetl1: orderDetls) {
+ //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
+ if(orderDetl1.getQty() < orderDetl.getAnfme()){
+ log=false;
+ }
+ }
+ if(log){
+ order.setSettle(4L);
+ }
+ if(!orderService.updateById(order)){
+ return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+ orderService.checkComplete(order.getOrderNo());
+ }
+ return R.ok("涓婃灦瀹屾垚");
+ }
+
+ @Transactional
+ @Override
+ public R manDetlOut(JSONObject json) {
+ Date date = new Date();
+ String jsonLocNo = (String) json.get("locNo");
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("name", jsonLocNo));
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
+ Order order = orderService.selectOne(new EntityWrapper<Order>()
+ .eq("order_no", jsonOrderDetl.getOrderNo()));
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄嚭搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakout()!=1 || docType.getStatus()!=1){
+ return R.error("璇ヨ鍗曟槸鍏ュ簱璁㈠崟锛屾棤娉曞嚭搴�");
+ }
+ if (Cools.isEmpty(node, order)) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+ }
+ if (jsonOrderDetl.getAnfme() > (orderDetl.getAnfme() - orderDetl.getWorkQty())) {
+ return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍙嚭鏁伴噺");
+ }
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙�
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),orderDetl.getBatch());
+ if (checkManLocDetl == null) {
+ return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
+ }
+ if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
+ return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
+ }
+ Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
+ if (finalQty <= 0){
+ if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ }else {
+ if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ }
+ orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setUpdateTime(date);
+ orderDetlService.updateById(orderDetl);
+ //鏇存柊璁㈠崟鐘舵��
+ List<OrderDetl> orderDetls=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
+ order.setSettle(2L);
+ boolean log=true;
+ for (OrderDetl orderDetl1: orderDetls) {
+ //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
+ if(orderDetl1.getQty() < orderDetl.getAnfme()){
+ log=false;
+ }
+ }
+ if(log){
+ order.setSettle(4L);
+ }
+ if(!orderService.updateById(order)){
+ return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+ orderService.checkComplete(order.getOrderNo());
+ }
+ return R.ok("涓嬫灦瀹屾垚");
+ }
+
+
}
--
Gitblit v1.9.1