From 189beaf2f9925fe852ca3ac0b4b2ab2d629232ad Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 26 二月 2025 12:46:17 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/OpenController.java | 44 ++------------------------------------------
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 1 +
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 10 ++++++++--
src/main/resources/application.yml | 2 +-
4 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5de23fc..6a56c94 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -134,7 +134,7 @@
mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
mappingOrderParamDB40(param, false, "鍗婃垚鍝佽皟鎷ㄥ崟");
- mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
+ //mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
@@ -210,7 +210,7 @@
mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
mappingOrderParamDB40(param, false, "鍗婃垚鍝佽皟鎷ㄥ崟");
- mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
+ //mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
@@ -518,47 +518,7 @@
//return orderSyncParam;
}
- private void mappingOrderParam40(OrderProdSyncParam param, boolean pakin, String docName) {
- //鐢熸垚鍗曟嵁涓讳綋
- OrderSyncParam orderSyncParam = new OrderSyncParam();
- Synchro.Copy(param, orderSyncParam);
- if (Cools.isEmpty(orderSyncParam.getCPOID())) {
- orderSyncParam.setCPOID(param.getOrderNoT());
- }
- if (Cools.isEmpty(orderSyncParam.getDdate())) {
- orderSyncParam.setDdate(param.getOrderTime());
- }
- orderSyncParam.setCPOID("EB" + orderSyncParam.getCPOID());
- //鐢熸垚鍗曟嵁鏄庣粏
- OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
- Synchro.Copy(param, orderDetl);
-
- if (!(param.getCInvCode().startsWith("401") || param.getCInvCode().startsWith("402"))) {
- return;
- }
- //orderDetl.setcInvCode(param.getCInvCode());
- //orderDetl.setiQuantity(param.getIQuantity());
- orderDetl.setCDefine22(param.getIvouchrowno());
- //orderDetl.setbFree1(param.getBFree1());
- orderDetl.setId(param.getId());
- orderDetl.setIvouchrowno(param.getIvouchrowno());
- orderDetl.setINum(param.getINum());
- orderDetl.setIinvexchrate(param.getIinvexchrate());
-
- //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
- List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
- orderDetls.add(orderDetl);
-
- orderSyncParam.setChildren(orderDetls);
-
-// String docName = param.getIQuantity() > 0 ? "閾跺骇浜у搧鐢熶骇鍏ュ簱鍗�" : "鍏ュ簱閫�鍥炲崟";
-// boolean pakin = param.getIQuantity() > 0 ? true : false;
-
- openService.syncOrder(orderSyncParam, pakin, docName);
-
- //return orderSyncParam;
- }
// @PostMapping("/order/add")
// public R re(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 968877f..b6744b8 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -201,8 +201,14 @@
String[] split = o.toString().split(",");
//-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
if (split[0].equals("-1")) {
- wrapper.like("order_no", "EB", SqlLike.RIGHT);
- wrapper.in("source", split);
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() != 33) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source", docIds).andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT);
} else {
wrapper.in("source", split);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 07c0a8c..833e27d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -234,6 +234,7 @@
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
if (config != null && config.getStatus() == 1 && config.getValue().equals("1") && processUseTiShengJi(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo())) {
// TODO 鍥涙湡
+ agvTaskCreateParam.setTaskTyp("F100");
} else {
switch (agvWrkMast.getIoType()) {
case 114:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5211fd6..f4d5610 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: loc
+ active: prod
--
Gitblit v1.9.1