From f746571f6d16529b8e2593e1d25681dde592d56c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 18 四月 2024 11:11:48 +0800
Subject: [PATCH] 商品档案全量导出修改
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 100 ++++++++++++++++++++++----------------------------
1 files changed, 44 insertions(+), 56 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 a8cb3bb..81b0926 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,27 +1,22 @@
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.R;
+import com.core.common.SnowflakeIdWorker;
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.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
-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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,14 +74,18 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
-
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
public void comb(CombParam param, Long userId) {
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
+ }
+ if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
@@ -136,11 +135,17 @@
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);
+ waitPakin.setBrand("缁勪欢");
+ } else {
+ waitPakin.sync(mat);
+ }
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -669,20 +674,18 @@
return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
}
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", jsonOrderDetl.getOrderNo())
- .and()
- .eq("maktx",jsonOrderDetl.getMaktx()));
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getBatch());
if (Cools.isEmpty(orderDetl)) {
return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+ }
+ if (Cools.isEmpty(orderDetl.getAnfme())) {
+ return R.error("鏁伴噺涓虹┖锛�");
}
if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
}
- ManLocDetl checkManLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr())
- .eq("batch",orderDetl.getBatch()));
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
if (checkManLocDetl == null) {
ManLocDetl manLocDetl = new ManLocDetl();
Synchro.Copy(orderDetl, manLocDetl);
@@ -694,13 +697,13 @@
manLocDetl.setModiTime(date);
manLocDetl.setCreateTime(date);
manLocDetl.setBatch(jsonOrderDetl.getBatch());
- manLocDetlService.insert(manLocDetl);
+ if(!manLocDetlService.insert(manLocDetl)){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
} else {
- checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme());
- checkManLocDetl.setModiTime(date);
- manLocDetlService.update(checkManLocDetl, new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
+ 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());
@@ -748,46 +751,30 @@
if (Cools.isEmpty(node, order)) {
return R.error("鍙傛暟涓虹┖");
}
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", jsonOrderDetl.getOrderNo())
- .and()
- .eq("maktx",jsonOrderDetl.getMaktx())
- .and()
- .eq("batch",jsonOrderDetl.getBatch()));
+ 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 manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .and()
- .eq("maktx", jsonOrderDetl.getMaktx())
- .and()
- .eq("batch",jsonOrderDetl.getBatch()));
- if (manLocDetl == null) {
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙�
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),orderDetl.getBatch());
+ if (checkManLocDetl == null) {
return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
}
- if (jsonOrderDetl.getAnfme() > manLocDetl.getAnfme()) {
+ if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
}
- Double finalQty = manLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
+ Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
if (finalQty <= 0){
- manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .and()
- .eq("matnr", orderDetl.getMatnr())
- .and()
- .eq("batch",jsonOrderDetl.getBatch()));
+ if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
}else {
- manLocDetl.setAnfme(finalQty);
- manLocDetl.setModiTime(date);
- manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr())
- .and()
- .eq("batch",jsonOrderDetl.getBatch()));
+ 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());
@@ -814,4 +801,5 @@
return R.ok("涓嬫灦瀹屾垚");
}
+
}
--
Gitblit v1.9.1