From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 583 +++++++++++++---------------------------------------------
1 files changed, 132 insertions(+), 451 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 e9ab1b0..82eb1e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,14 +7,15 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.ForwardAGVTaskParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.mapper.BasDevpMapper;
-import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.AgvSiteConstant;
import com.zy.common.constant.ApiInterfaceConstant;
-import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesCombParam;
@@ -22,12 +23,11 @@
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -72,17 +72,15 @@
private CommonService commonService;
@Autowired
private NodeService nodeService;
- @Autowired
- private ManLocDetlService manLocDetlService;
- @Autowired
- private ManLocDetlMapper manLocDetlMapper;
- @Resource
- private InventoryCheckOrderService checkOrderService;
- @Resource
- private InventoryCheckOrderDetlService checkOrderDetlService;
@Resource
private BasDevpMapper basDevpMapper;
+
+ @Value("${mes.url}")
+ private String url;
+
+ @Value("${mes.code}")
+ private String code;
@Override
public R inLocCallAgv(String sta, String inSta) {
@@ -108,7 +106,7 @@
default:
}
int count = wrkMastService.selectCount(wrapper);
- log.info("鍏ュ簱鍛煎彨agv鍛煎彨绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{},鍑哄簱浠诲姟鏁帮細{}",sta,inSta,count);
+ log.info("鍏ュ簱鍛煎彨agv鍛煎彨绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{},鍑哄簱浠诲姟鏁帮細{}", sta, inSta, count);
if (count != 0) {
return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
}
@@ -135,17 +133,11 @@
String message = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(ApiInterfaceConstant.AGV_IP)
- .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
- .setJson(body)
- .build()
- .doPost();
+ response = new HttpHandler.Builder().setUri(ApiInterfaceConstant.AGV_IP).setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH).setJson(body).build().doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(0)) {
success = true;
- // 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
- basDevp.setDevMk("1");
+ // 鍏ュ簱鏆傚瓨+1
basDevp.setInQty(basDevp.getInQty() + 1);
basDevpMapper.updateById(basDevp);
} else {
@@ -157,15 +149,7 @@
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鍏ュ簱鍛煎彨agv",
- ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
- null,
- "127.0.0.1",
- body,
- response,
- success
- );
+ apiLogService.save("鍏ュ簱鍛煎彨agv", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, null, "127.0.0.1", body, response, success);
} catch (Exception e) {
log.error("", e);
}
@@ -181,22 +165,17 @@
return R.parse("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠锛�" + site);
}
JSONObject jsonObject = new JSONObject();
- jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
- jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
- jsonObject.put("indBind","0"); // 1缁戝畾锛�0瑙ｇ粦
+ jsonObject.put("reqCode", UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
+ jsonObject.put("ctnrTyp", "2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("stgBinCode", staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
+ jsonObject.put("indBind", "0"); // 1缁戝畾锛�0瑙ｇ粦
String body = jsonObject.toJSONString();
String response = "";
String message = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(ApiInterfaceConstant.AGV_IP)
- .setPath(ApiInterfaceConstant.AGV_BIND_PATH)
- .setJson(body)
- .build()
- .doPost();
+ response = new HttpHandler.Builder().setUri(ApiInterfaceConstant.AGV_IP).setPath(ApiInterfaceConstant.AGV_BIND_PATH).setJson(body).build().doPost();
JSONObject res = JSON.parseObject(response);
message = jsonObject.getString("message");
if (res.getInteger("code").equals(0)) {
@@ -209,15 +188,7 @@
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "璋冪敤agv瑙ｇ粦鏆傚瓨浣�",
- ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH,
- null,
- "127.0.0.1",
- body,
- response,
- success
- );
+ apiLogService.save("璋冪敤agv瑙ｇ粦鏆傚瓨浣�", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH, null, "127.0.0.1", body, response, success);
} catch (Exception e) {
log.error("", e);
}
@@ -228,25 +199,20 @@
private boolean bindPodAndBerth(String sta) {
String staMap = AgvSiteConstant.SiteMap.get(sta);
if (staMap == null) {
- log.error("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠:{}",sta);
+ log.error("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠:{}", sta);
return false;
}
JSONObject jsonObject = new JSONObject();
- jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
- jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
- jsonObject.put("indBind","1"); // 1缁戝畾锛�0瑙ｇ粦
+ jsonObject.put("reqCode", UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
+ jsonObject.put("ctnrTyp", "2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("stgBinCode", staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
+ jsonObject.put("indBind", "1"); // 1缁戝畾锛�0瑙ｇ粦
String body = jsonObject.toJSONString();
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(ApiInterfaceConstant.AGV_IP)
- .setPath(ApiInterfaceConstant.AGV_BIND_PATH)
- .setJson(body)
- .build()
- .doPost();
+ response = new HttpHandler.Builder().setUri(ApiInterfaceConstant.AGV_IP).setPath(ApiInterfaceConstant.AGV_BIND_PATH).setJson(body).build().doPost();
JSONObject res = JSON.parseObject(response);
if (res.getInteger("code").equals(0)) {
success = true;
@@ -258,15 +224,7 @@
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "璋冪敤agv缁戝畾浠撲綅",
- ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH,
- null,
- "127.0.0.1",
- body,
- response,
- success
- );
+ apiLogService.save("璋冪敤agv缁戝畾浠撲綅", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH, null, "127.0.0.1", body, response, success);
} catch (Exception e) {
log.error("", e);
}
@@ -280,28 +238,26 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if(param.getCombMats().size()>1){
- throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
- param.getCombMats().forEach(elem -> {
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode())
- .eq("io_status", "N")
- .eq("matnr",elem.getMatnr()).eq("batch",elem.getBatch())) > 0) {
- throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
- }
- });
-
- if(param.getBarcode().length()!=9){
- throw new CoolException("鏉＄爜闀垮害涓嶆槸9浣�===>>" + param.getBarcode());
+// if(param.getCombMats().size()>1){
+// throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
+// }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
-// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ if (param.getBarcode().length() != 8) {
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+ }
+// if (param.getCombMats().size()>1){
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+// }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+ throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
Date now = new Date();
@@ -312,15 +268,6 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
-
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode())
- .eq("io_status", "N")
- .eq("matnr",elem.getMatnr()).eq("batch",elem.getBatch())) > 0) {
- throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
- }
-
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
@@ -339,6 +286,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+ waitPakin.setTemp2(detlDto.getTemp2());
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -352,80 +300,55 @@
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
- // 鍏宠仈缁勬墭
+ // 鍏宠仈缁勬墭
} else {
- Order order = orderService.selectByNo(param.getOrderNo());
+
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", param.getOrderNo()));
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
-
- for (CombParam.CombMat elem : param.getCombMats()) {
-
-
-// param.getCombMats().forEach(elem -> {
+ param.getCombMats().forEach(elem -> {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
- }
+ OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increaseWorkQtyById(orderDetl.getId(), elem.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
- , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
-// });
- }
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+ waitPakin.setBatch(orderDetl.getBatch()); // 搴忓垪鐮�
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setAnfme(elem.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setManu(detlDto.getMark()); //鏍囪
- waitPakin.setOrigin(order.getItemName());//浠撳簱
- waitPakin.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
- waitPakin.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
- waitPakin.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
- waitPakin.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
- waitPakin.setTemp1(detlDto.getTemp1());
- waitPakin.setTemp2(detlDto.getTemp2());
- waitPakin.setTemp3(detlDto.getTemp3());
- waitPakin.setTemp4(detlDto.getTemp4());
+
+ waitPakin.setBatch(orderDetl.getBatch());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
- }
+ });
+
orderService.updateSettle(order.getId(), 2L, userId);
}
}
+
@Override
@Transactional
@@ -434,7 +357,7 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ if (param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)) {
throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
}
Order order = orderService.selectByNo(param.getOrderNo());
@@ -443,20 +366,19 @@
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 104){
+ if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 104) {
throw new CoolException(param.getBarcode() + "璇ユ潯鐮佹暟鎹笉涓哄苟鏉垮嚭搴�");
}
//璁剧疆闈瀗ull鎵瑰彿锛�
for (CombParam.CombMat combMat : param.getCombMats()) {
- if (combMat.getBatch() == null){
+ if (combMat.getBatch() == null) {
combMat.setBatch("");
}
}
@@ -479,6 +401,7 @@
Mat mat = matService.selectByMatnr(combMat.getMatnr());
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
+ wrkDetl.setSku(combMat.getBatch());
wrkDetl.setBatch(combMat.getBatch());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setOrderNo(param.getOrderNo());
@@ -489,67 +412,17 @@
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
wrkDetl.setManu(orderDetl.getManu());
+ wrkDetl.setSupp(orderDetl.getSupp());
+ wrkDetl.setTemp1(orderDetl.getTemp1());
+ wrkDetl.setTemp2(orderDetl.getTemp2());
+ wrkDetl.setTemp3(orderDetl.getTemp3());
+ wrkDetl.setTemp4(orderDetl.getTemp4());
wrkDetlService.insert(wrkDetl);
}
-
-
-
}
- // 鍟嗗搧涓婃灦
- @Override
- public void onSale(CombParam param) {
- Date now = new Date();
- // 鑾峰彇搴撲綅鍙�
- String locno = param.getLocno();
- Node node = nodeService.selectByUuid(locno);
- if (Cools.isEmpty(node)) {
- throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�");
- }
-
- // 鑾峰彇鍟嗗搧鍒楄〃
- for(CombParam.CombMat combMat : param.getCombMats()){
- Mat mat = matService.selectByMatnr(combMat.getMatnr());
- if (Cools.isEmpty(mat)){
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
- }
- if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme()==0){
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
- }
- if (Cools.isEmpty(combMat.getBatch())){
-// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
- }
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(locno);
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
- manLocDetl.setAnfme(combMat.getAnfme());
- manLocDetl.setModiTime(now);
- if (!manLocDetlService.insert(manLocDetl)) {
- throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
- }
- }
- }
-
- // 鍟嗗搧涓嬫灦
- @Override
- public void offSale(OffSaleParam offSaleParam) {
- ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- if (Cools.isEmpty(manLocDetl)){
- throw new CoolException("鏃犳鍟嗗搧锛�");
- }
- double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
- if (anfme < 0) {
- throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�");
- } else if (anfme == 0){
- manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- }
- manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId());
- }
// 鏌ユ壘鍟嗗搧
@@ -607,7 +480,9 @@
// 娣诲姞鏄庣粏
for (WrkDetl wrkDetl : list) {
- if (wrkDetl.getAnfme() == 0.0D) { continue; }
+ if (wrkDetl.getAnfme() == 0.0D) {
+ continue;
+ }
// todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
String orderNo = wrkDetl.getOrderNo();
Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
@@ -623,7 +498,7 @@
}
// 淇敼鐩樼偣浠诲姟涓绘。鐘舵��
- wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0?"Y":"N");
+ wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0 ? "Y" : "N");
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
if (!wrkMastService.updateById(wrkMast)) {
@@ -639,8 +514,7 @@
throw new CoolException(BaseRes.PARAM);
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
Date now = new Date();
@@ -689,40 +563,40 @@
}
String response = "";
boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PACK_DOWN_URL)
- .setJson(JSON.toJSONString(mesCombParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else if (jsonObject.getInteger("code").equals(500)) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException(jsonObject.getString("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- throw new CoolException(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎵撳寘涓嬬嚎甯墭涓婃姤",
- MesConstant.URL + MesConstant.PACK_DOWN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(mesCombParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(url)
+// .setPath(code)
+// .setJson(JSON.toJSONString(mesCombParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+// success = true;
+// } else if (jsonObject.getInteger("code").equals(500)) {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+// throw new CoolException(jsonObject.getString("msg"));
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+// }
+// } catch (Exception e) {
+// log.error("fail", e);
+// throw new CoolException(e.getMessage());
+// } finally {
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鎵撳寘涓嬬嚎甯墭涓婃姤",
+// MesConstant.URL + MesConstant.PACK_DOWN_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(mesCombParam),
+// response,
+// success
+// );
+// } catch (Exception e) { log.error("", e); }
+// }
}
@@ -732,7 +606,7 @@
openParam.setOrderNo(orderNo);
openParam.setInboundDate(DateUtils.convert(now));
openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
+ openParam.setDetails(detlDtos);
openService.pakinOrderCreate(openParam);
Order order = orderService.selectByNo(orderNo);
if (null == order) {
@@ -798,34 +672,32 @@
BasDevp sta = basDevpService.checkSiteStatus(staNo);
//鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
- if (order.getSettle() != 1 && order.getSettle() != 2){
+ if (order.getSettle() != 1 && order.getSettle() != 2) {
throw new CoolException("璇ヨ鍗曞凡澶勭悊");
}
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
Date now = new Date();
- for(OrderDetl orderDetl : orderDetls){
+ for (OrderDetl orderDetl : orderDetls) {
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
- for(LocDetl locDetl : locDetls){
+ for (LocDetl locDetl : locDetls) {
//濡傛灉璇ュ簱浣嶅嚭搴撹矾绾挎墍鐢ㄧ殑鍫嗗灈鏈簅ut_enable涓嶄负Y,璺宠繃璇ュ惊鐜�
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locDetl.getLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
if (Cools.isEmpty(locMast)) {
continue;
}
- BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
- .eq("crn_no", locMast.getCrnNo()));
- if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")){
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", locMast.getCrnNo()));
+ if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")) {
continue;
}
//鍙嚭搴撴暟閲� = 璁㈠崟鏁伴噺 - 浣滀笟涓暟閲�
Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
- if(outQty <= 0){
+ if (outQty <= 0) {
break;
}
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
@@ -837,18 +709,17 @@
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
- if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
+ if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))) {
throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
- Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo)
- .eq("matnr",orderDetl.getMatnr());
- if(!Cools.isEmpty(orderDetl.getBatch())){
+ Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", orderDetl.getMatnr());
+ if (!Cools.isEmpty(orderDetl.getBatch())) {
wrapper.eq("batch", orderDetl.getBatch());
}
- if(!orderDetlService.update(orderDetl, wrapper)){
+ if (!orderDetlService.update(orderDetl, wrapper)) {
throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
}
}
@@ -858,13 +729,13 @@
@Override
// @Transactional
- public void leftoversOut(Map<String, Object> map,Long userId) {
+ public void leftoversOut(Map<String, Object> map, Long userId) {
String barcode = map.get("barcode").toString();
String barcode2 = map.get("barcode2").toString();
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",barcode2));
- int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",barcode2).ne("io_type",200));
- int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode2));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", barcode2));
+ int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode2).ne("io_type", 200));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode2));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("璇ユ潯鐮佸凡琚娇鐢�===>>" + barcode2);
}
@@ -909,7 +780,7 @@
throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟鏄庣粏");
}
- for(WrkDetl wrkDetl : wrkDetls){
+ for (WrkDetl wrkDetl : wrkDetls) {
WrkDetl wrkDetl1 = new WrkDetl();
wrkDetl1.sync(wrkDetl);
wrkDetl1.setWrkNo(workNo);
@@ -917,206 +788,16 @@
}
-
}
- @Override
- public void pdaAdjust(pdaAdjustParam param, Long userId) {
- if (Cools.isEmpty(param)){
- throw new CoolException("鐩樼偣鍒楄〃鍙傛暟涓虹┖");
- }
- for (InventoryCheckOrderDetl orderDetl: param.getParam()){
- InventoryCheckOrderDetl inventoryCheckOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", orderDetl.getOrderNo())
- .eq("matnr", orderDetl.getMatnr())
- .eq("batch", orderDetl.getBatch()));
- if (Cools.isEmpty(inventoryCheckOrderDetl)){
- throw new CoolException("鏈煡璇㈠埌鐩樼偣淇℃伅");
- }
- if (!inventoryCheckOrderDetl.getStatus().equals("1")){
- throw new CoolException("璇ヤ换鍔″凡鐩樼偣");
- }
- inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme());
- inventoryCheckOrderDetl.setStatus("2");
- if (!checkOrderDetlService.updateById(inventoryCheckOrderDetl)){
- throw new CoolException("淇濆瓨鐩樼偣淇℃伅澶辫触!");
- }
-
- }
-
-
-
- }
@Override
@Transactional
- public void inventoryUpload(String orderId) {
- if (Cools.isEmpty(orderId)){
- throw new CoolException("鐩樼偣鍗昳d涓虹┖");
- }
- InventoryCheckOrder inventoryCheckOrder = checkOrderService.selectById(orderId);
- if (Cools.isEmpty(inventoryCheckOrder)){
- throw new CoolException("鏈壘鍒扮洏鐐瑰崟");
- }
- if (inventoryCheckOrder.getStatus().equals("2")){
- throw new CoolException("鐩樼偣鍗曞凡鎻愪氦");
- }
- int count = checkOrderDetlService.selectCount(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", inventoryCheckOrder.getOrderNo()).isNull("check_anfme"));
- if (count>0){
- throw new CoolException("鏈夋湭瀹屾垚鐨勭洏鐐逛换鍔�");
- }
-
- List<InventoryCheckOrderDetl> checkOrderProfitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", inventoryCheckOrder.getOrderNo())
- .addFilter("anfme < check_anfme"));
- if (!checkOrderProfitDetls.isEmpty()){
- //鑾峰彇鐩樼泩鍗昿aram
- InventoryErpParam erpProfitParam = getErpProfitParam(inventoryCheckOrder, checkOrderProfitDetls);
- uploadErp(erpProfitParam);
- }
-
- List<InventoryCheckOrderDetl> checkOrderDeficitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", inventoryCheckOrder.getOrderNo())
- .addFilter("anfme > check_anfme"));
-
- if (!checkOrderDeficitDetls.isEmpty()){
- //鑾峰彇鐩樹簭鍗昿aram
- InventoryErpParam erpDeficitParam = getErpDeficitParam(inventoryCheckOrder, checkOrderDeficitDetls);
- uploadErp(erpDeficitParam);
- }
-
- inventoryCheckOrder.setStatus("2");
- if (!checkOrderService.updateById(inventoryCheckOrder)){
- throw new CoolException("鐘舵�佹洿鏂板け璐�");
- }
-
-
-
-
- }
-
- public void uploadErp(InventoryErpParam param){
- String response = "";
- boolean success = false;
- try {
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Content-Type", "application/json");
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri("10.0.100.160:30108")
- .setPath("web/apps/gongqi.df.dataTrans/DTInterFace/doJobWithupdateBody")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("errcode").equals(0)) {
- success = true;
- } else if (jsonObject.getInteger("errcode").equals(1)) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
- throw new CoolException(jsonObject.getString("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- throw new CoolException(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鐩樼偣鍗曚笂鎶�",
- MesConstant.URL + MesConstant.PACK_DOWN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(param),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
- }
-
- public InventoryErpParam getErpProfitParam(InventoryCheckOrder inventoryCheckOrder,List<InventoryCheckOrderDetl> checkOrderProfitDetls) {
- Date date = new Date();
- InventoryErpParam erpProfitParam = new InventoryErpParam();
- InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
- dataJson.setFlowCode("LIKUwms12GOTmes");
- dataJson.setTableCode("DTInventInTable_pdd");
- dataJson.setLogName("鐩樼泩鍗�-鍏ュ簱鍗�");
- erpProfitParam.setDataJson(dataJson);
- List<InventoryErpParam.UpdateJson> updateJsonList = new ArrayList<>();
- InventoryErpParam.UpdateJson updateJson = new InventoryErpParam.UpdateJson();
- updateJson.setOrderNo(inventoryCheckOrder.getOrderNo());
- updateJson.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
- List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
- for (InventoryCheckOrderDetl checkOrderProfitDetl: checkOrderProfitDetls){
- InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();
-
- Mat mat = matService.selectByMatnr(checkOrderProfitDetl.getMatnr());
-
- matDetail.setMatnr(checkOrderProfitDetl.getMatnr());
- matDetail.setBatch(checkOrderProfitDetl.getBatch());
- matDetail.setSpecs(mat.getSpecs());
- Double anfme = new BigDecimal(checkOrderProfitDetl.getCheckAnfme()).subtract(new BigDecimal(checkOrderProfitDetl.getAnfme())).doubleValue();
- matDetail.setAnfme(anfme);
- matDetail.setLocNo(checkOrderProfitDetl.getLocNo());
- matDetail.setWarehouse(checkOrderProfitDetl.getArea());
- matDetail.setSeq(updateJson.getMatDetails() == null?1:updateJson.getMatDetails().size()+1);
- matDetails.add(matDetail);
- }
- updateJson.setMatDetails(matDetails);
- updateJsonList.add(updateJson);
- erpProfitParam.setUpdateJson(updateJsonList);
- return erpProfitParam;
- }
-
- public InventoryErpParam getErpDeficitParam(InventoryCheckOrder inventoryCheckOrder,List<InventoryCheckOrderDetl> checkOrderDeficitDetls) {
- Date date = new Date();
- InventoryErpParam erpDeficitParam = new InventoryErpParam();
- InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
- dataJson.setFlowCode("LIKUwms12GOTmes");
- dataJson.setTableCode("DTInventOutTable_pdd");
- dataJson.setLogName("鐩樹簭鍗�-鍑哄簱鍗�");
- erpDeficitParam.setDataJson(dataJson);
- List<InventoryErpParam.UpdateJson> updateJsonList2 = new ArrayList<>();
- InventoryErpParam.UpdateJson updateJson2 = new InventoryErpParam.UpdateJson();
- updateJson2.setOrderNo(inventoryCheckOrder.getOrderNo());
- updateJson2.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
- List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
- for (InventoryCheckOrderDetl checkOrderDeficitDetl: checkOrderDeficitDetls){
- InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();
-
- Mat mat = matService.selectByMatnr(checkOrderDeficitDetl.getMatnr());
-
- matDetail.setMatnr(checkOrderDeficitDetl.getMatnr());
- matDetail.setBatch(checkOrderDeficitDetl.getBatch());
- matDetail.setSpecs(mat.getSpecs());
- Double anfme = new BigDecimal(checkOrderDeficitDetl.getAnfme()).subtract(new BigDecimal(checkOrderDeficitDetl.getCheckAnfme())).doubleValue();
- matDetail.setAnfme(anfme);
- matDetail.setLocNo(checkOrderDeficitDetl.getLocNo());
- matDetail.setWarehouse(checkOrderDeficitDetl.getArea());
- matDetail.setSeq(updateJson2.getMatDetails() == null?1:updateJson2.getMatDetails().size()+1);
- matDetails.add(matDetail);
- }
- updateJson2.setMatDetails(matDetails);
- updateJsonList2.add(updateJson2);
- erpDeficitParam.setUpdateJson(updateJsonList2);
- return erpDeficitParam;
- }
-
- @Override
- @Transactional
- public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
- Double curOutQty, Integer ioType, Long userId, Date now) {
+ public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl, Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
// 鑾峰彇璺緞
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", ioType)
- .eq("stn_no", staNo.getDevNo())
- .eq("crn_no", locMast.getCrnNo());
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", ioType).eq("stn_no", staNo.getDevNo()).eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
--
Gitblit v1.9.1