From b3b5eb6bd7955afb4be48f0e34a18b92a38b102d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 18 十二月 2025 15:15:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 41 ++++++++++---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 2
src/main/webapp/views/apiLog/apiLog.html | 6 ++
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 29 ++++-----
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 9 ++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 23 ++++++-
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 3
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 19 ++++--
src/main/webapp/views/order/order.html | 2
9 files changed, 96 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 59741ab..2739897 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -29,6 +29,14 @@
@Autowired
private OrderDetlService orderDetlService;
@Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
@@ -398,19 +406,32 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
- orderService.remove(orderId);
-// Order order = orderService.selectById(orderId);
-// if (order != null) {
-// order.setStatus(0);
-// }
-// if (!orderService.updateById(order)) {
-// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
-// }
-// orderDetlService.modifyStatus(orderId, 0);
+ public R delete(@RequestParam Long orderId) {
+ // 鑾峰彇璁㈠崟淇℃伅
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("id", orderId));
+ String orderNo = order.getOrderNo();
+
+ // 鍒犻櫎 OrderDetl 琛ㄤ腑涓庤鍗曠浉鍏崇殑鏁版嵁
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+
+ // 鏍规嵁 PakinPakoutStatus 鍒犻櫎鐩稿叧鏁版嵁
+ if (order.getPakinPakoutStatus() == 1) {
+ // 鍒犻櫎 OrderPakin 鍜� OrderDetlPakin 鐩稿叧鏁版嵁
+ orderPakinService.delete(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_no", orderNo));
+ } else if (order.getPakinPakoutStatus() == 2) {
+ // 鍒犻櫎 OrderPakout 鍜� OrderDetlPakout 鐩稿叧鏁版嵁
+ orderPakoutService.delete(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
+ }
+
+ // 鍒犻櫎 Order 琛ㄤ腑瀵瑰簲鐨勮鍗曟暟鎹�
+ orderService.delete(new EntityWrapper<Order>().eq("order_no", orderNo));
+
return R.ok();
}
+
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
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 1f6366c..d338c1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -872,7 +872,7 @@
agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
agvBindCtnrAndBinParam.setIndBind("1");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦",
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾",
AgvConstant.AGV_URL+"/"+AgvConstant.AGV_1LBind,AgvConstant.getAGVADAPTOR(1), agvBindCtnrAndBinParam);
if(resultBind.getCode() != 200){
throw new CoolException("agv鍏ュ簱缁戝畾澶辫触");
@@ -888,7 +888,8 @@
@Override
@Transactional
- public void combAuto(CombParam param, Long userId) {
+ public void
+ combAuto(CombParam param, Long userId) {
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -920,10 +921,26 @@
String orderNo = null;
for (CombParam.CombMat combMat : param.getCombMats()) {
if(combMat.getSupplier().equals("1")){
+// List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
+// .eq("matnr", combMat.getMatnr()).eq("box_type3", combMat.getOrderNo())
+// .eq("standby1", combMat.getStandby1()).eq("standby2", combMat.getStandby2())
+// .eq("standby3", combMat.getStandby3()).eq("box_type2","BU-00001"));//1鏃舵绱㈠拰寰�
+// if (orderDetlPakins.size() > 0) {
+// orderNo = orderDetlPakins.get(0).getOrderNo();
+// combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
+// combMat.setBoxType2(orderDetlPakins.get(0).getBoxType2());
+// combMat.setBoxType3(orderDetlPakins.get(0).getBoxType3());
+// combMat.setMemo(orderDetlPakins.get(0).getMemo());
+// combMat.setSupp(orderDetlPakins.get(0).getSupp());
+// combMat.setSuppCode(orderDetlPakins.get(0).getSuppCode());
+// combMat.setManu(orderDetlPakins.get(0).getManu());//浠撳簱缂栫爜
+// } else {
+// throw new CoolException("鏈煡璇㈠埌鐩稿叧璁㈠崟===>>" + param.getBarcode());
+// }
List<OrderDetlPakin> orderDetlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()
.eq("matnr", combMat.getMatnr()).eq("box_type3", combMat.getOrderNo())
.eq("standby1", combMat.getStandby1()).eq("standby2", combMat.getStandby2())
- .eq("standby3", combMat.getStandby3()).eq("box_type2","BU-00001"));//1鏃舵绱㈠拰寰�
+ .eq("standby3", combMat.getStandby3()).eq("box_type2","shyucheng.test"));
if (orderDetlPakins.size() > 0) {
orderNo = orderDetlPakins.get(0).getOrderNo();
combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 62bf69c..3b2e4ba 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -46,6 +46,13 @@
//閬嶅巻鍗曟嵁
for (String orderNo : orderNos) {
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no",orderNo));
+ if(orderPakin.getDocType() == 16){
+ orderPakin.setMoveStatus(1);
+ orderPakinService.updateById(orderPakin);
+ continue;
+ }
+
try{
List<OrderDetlPakin> orderDetlPakinListAll = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo).eq("inspect",0));
if (orderDetlPakinListAll.size()<1){
@@ -77,7 +84,7 @@
return;
} else if (number == 0){
- Integer status = basArmRulesService.getStatus(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
+ Integer status = basArmRulesService.getStatus(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
if (!Cools.isEmpty(status) && status == 2){
continue;
} else {
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index f24ffc5..205d109 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -12,10 +12,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Created by Monkey D. Luffy on 2023.07.25
@@ -58,7 +56,7 @@
put(1005, 1007);put(1008, 1010);put(1019, 1021);put(1022, 1024);put(1029, 1031);
put(2001, 2003);put(2007, 2009);put(2013, 2015);put(2019, 2021);put(2025, 2027);
put(2003, 2003);put(2009, 2009);put(2015, 2015);put(2021, 2021);put(2027, 2027);
- put(1105,1105);put(1104,1105);put(1043,1042);put(1042,1042);
+ put(1105,1105);put(1104,1105);put(1043,1042);put(1042,1042);put(1103,1105);put(1044,1042);
}};
public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
put(1043, 1042);put(1042, 1042);put(1044, 1042);put(1105, 1105);put(1104, 1105);
@@ -85,8 +83,10 @@
// }};
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/2 * * * * ? ")
private void execute(){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String currentTime = sdf.format(new Date());
for(Integer staNo : STA_WORK_IN){
BasDevp basDevp = basDevpService.selectById(staNo);
basDevp.setDevNo(siteInMap.get(basDevp.getDevNo()));
@@ -95,7 +95,6 @@
if(Cools.isEmpty(wrkMast)){
continue;
}
-// boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);//鍏ュ簱
if (result.getCode()==200){
@@ -115,19 +114,12 @@
if (Cools.isEmpty(wrkMast)){
continue;
}
-
-// if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
-// continue;
-// }
-// boolean wrkTypeSign = fullKM(wrkMast);
-
if (!Cools.isEmpty(wrkMast)){
-// if (wrkTypeSign){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//鍑哄簱
if (result.getCode()==200) {
continue;
} else {
- System.out.println(staNo+"澶辫触3锛�");
+ System.out.println(staNo+"澶辫触2锛�");
}
}
}
@@ -137,7 +129,12 @@
basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
if (basDevp.getWrkNo() > 10000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//寮傚父閫�鍑�
- if (result.getCode()==200) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ continue;
+ }
+ if (result.getCode() == 200) {
+ System.out.println(staNo + "鏃堕棿锛�" + currentTime);
continue;
} else {
System.out.println(staNo+"澶辫触3锛�");
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
index 3ba7620..d7d7c24 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -18,7 +18,8 @@
@Value("${erp.switch.InboundOrderSwitch}")
private boolean InboundOrderSwitch;
- @Scheduled(cron = "0 */15 * * * ?")
+ @Scheduled(cron = "0 */30 * * * ?")
+// @Scheduled(cron = "0/20 * * * * ?")
void login(){
if(!InboundOrderSwitch){
return;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index afa04cb..69a6144 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -49,6 +49,8 @@
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
}
+// order.setSettle(8L);
+// orderService.updateById(order);
}else if( order.getDocType() == 21){ //瀵煎叆璁㈠崟鍑哄簱锛堥鏂欙級
order.setSettle(8L);
orderService.updateById(order);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 5c7bcf5..35986a5 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -156,11 +156,14 @@
path = orgAddress;
break;
case "PUR_RECEIVEBIll": //宸插鏍告敹鏂欏崟鏌ヨ
- jsonObject.put("start_biztime", "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
+ jsonObject.put("start_biztime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
+// jsonObject.put("start_biztime", "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
+// jsonObject.put("start_auditdate", "2025-01-01 00:00:00";
+
jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
jsonObject.put("billno", null);
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
- jsonObject.put("start_auditdate", "2025-11-25 00:00:00");
+ jsonObject.put("start_auditdate", latestUpdateTime);
jsonObject.put("end_auditdate", sdf1.format(now));
jsonObject.put("org_number", null);
jsonObject.put("supplier_number", null);
@@ -182,7 +185,7 @@
path = imMdcMftproorder;
// jsonObject.put("start_modifytime", "2025-11-25 00:00:00");
// jsonObject.put("start_auditdate", "2025-11-25 00:00:00");
- jsonObject.put("start_createtime", "2025-11-25 00:00:00");
+ jsonObject.put("start_createtime", latestUpdateTime);
jsonObject.put("end_createtime", sdf1.format(now));
// jsonObject.put("end_auditdate", sdf1.format(now));
// jsonObject.put("end_modifytime", sdf1.format(now));
@@ -197,7 +200,7 @@
jsonObject.put("billno", null);
jsonObject.put("org_number", null);
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
- jsonObject.put("start_createtime", "2025-11-25 00:00:00");
+ jsonObject.put("start_createtime", latestUpdateTime);
jsonObject.put("end_createtime", sdf1.format(now));
// jsonObject.put("start_modifytime", "2025-11-25 00:00:00");
// jsonObject.put("end_modifytime", sdf1.format(now));
@@ -210,7 +213,7 @@
jsonObject.put("billno", null);
jsonObject.put("org_number", null);
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
- jsonObject.put("start_createtime", "2025-11-25 00:00:00");
+ jsonObject.put("start_createtime", latestUpdateTime);
jsonObject.put("end_createtime", sdf1.format(now));
// jsonObject.put("start_modifytime", "2025-11-25 00:00:00");
// jsonObject.put("end_modifytime", sdf1.format(now));
@@ -220,13 +223,13 @@
case "PRD_MORPT"://鐢熶骇杩涗粨鍗�
path = imProductinbill;
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
- jsonObject.put("modifytime_start", "2025-11-25 00:00:00");
+ jsonObject.put("modifytime_start", latestUpdateTime);
jsonObject.put("modifytime_end", sdf1.format(now));
break;
case "STK_InspectionForm"://浜у搧妫�楠�
path = qcppManuinspec;
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
- jsonObject.put("auditdate_start", "2025-11-25 00:00:00");
+ jsonObject.put("auditdate_start", latestUpdateTime);
jsonObject.put("auditdate_end", sdf1.format(now));
break;
}
@@ -611,6 +614,7 @@
}
}
}
+ docType.setUpdateTime(now);
docTypeService.updateById(docType);
}
}
@@ -964,6 +968,7 @@
}
}
}
+ docType.setUpdateTime(now);
docTypeService.updateById(docType);
}
}
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index 132658e..20e51fa 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -35,6 +35,12 @@
<input class="layui-input" type="text" name="request" placeholder="璇疯緭鍏ワ紙璁㈠崟鍙锋垨鍝佸彿锛�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">result</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="result" placeholder="1/0" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index dc3c221..ae994f4 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -101,6 +101,8 @@
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
{{# } }}
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>-->
+
{{# if (d.settle == 98) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">褰诲簳瀹岀粨</a>
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="continueExecution">缁х画鎵ц</a>
--
Gitblit v1.9.1