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/entity/param/CombParam.java | 2
src/main/java/com/zy/asrs/controller/LocMastController.java | 3
src/main/java/com/zy/asrs/controller/LocDetlController.java | 3
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 3
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 28 --
pom.xml | 2
src/main/java/com/zy/asrs/controller/WrkMastController.java | 3
src/main/resources/mapper/OrderDetlMapper.xml | 2
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 40 ---
/dev/null | 121 ----------
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 3
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2
src/main/java/com/zy/asrs/utils/Utils.java | 24 --
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/resources/mapper/MatMapper.xml | 18 -
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 242 +++----------------
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 122 ----------
src/main/java/com/zy/asrs/controller/MatController.java | 25 --
src/main/webapp/static/js/common.js | 2
src/main/resources/application.yml | 12
src/main/java/com/zy/asrs/service/MobileService.java | 7
23 files changed, 62 insertions(+), 610 deletions(-)
diff --git a/pom.xml b/pom.xml
index f99c5d4..341da60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
</dependencies>
<build>
- <finalName>fyxcwms</finalName>
+ <finalName>wms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 4b7dd18..ea75a90 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -17,7 +17,6 @@
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -146,8 +145,6 @@
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByLocNo(getUserId(), wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index f6648dd..68e9b64 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -19,7 +19,6 @@
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -66,8 +65,6 @@
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 15f9a90..eacf7aa 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -17,9 +17,6 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.third.CodeDataParam;
-import com.zy.asrs.third.CodeParam;
-import com.zy.asrs.third.TokenUtils;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -98,27 +95,7 @@
return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
}
- @RequestMapping(value = "/mat/tiaoma/auth")
- @ManagerAuth
- public synchronized R findByTiaoMa(@RequestParam("matnr") String matnr, @RequestParam(required = false, value = "orderNo") String orderNo) {
- List<CodeDataParam> data = mobileService.getData(TokenUtils.getToken(url), new CodeParam(Arrays.asList(matnr)));
- if (data == null || data.isEmpty()) {
- return R.error("鏉＄爜涓嶅瓨鍦�");
- }
- CodeDataParam codeDataParam = data.get(0);
- if (!Cools.isEmpty(orderNo)) {
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", codeDataParam.getProductionCode()));
- if (orderDetls.isEmpty()) {
- return R.error("璇ュ晢鍝佷笉瀛樺湪鍦ㄥ崟鎹腑");
- }
- }
- Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", codeDataParam.getProductionCode()));
- mat.setMatnr(codeDataParam.getProductionCode());
- mat.setSafeQty(codeDataParam.getQty());
- mat.setUnit(codeDataParam.getBatchNum());
- mat.setMemo(matnr);
- return R.ok(mat);
- }
+
@RequestMapping(value = "/mat/list/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index fb4231a..2506a5d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -12,7 +12,6 @@
import com.core.common.R;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.service.WrkDetlService;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -51,8 +50,6 @@
} else {
wrapper.orderBy("appe_time", false);
}
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByBarcode(getUserId(), wrapper);
return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 416cba1..1106f24 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -12,7 +12,6 @@
import com.core.common.R;
import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.WrkDetlLogService;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -90,46 +89,7 @@
} else {
wrapper.orderBy("appe_time", false);
}
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByBarcode(getUserId(), wrapper);
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
-// Integer wrkNo = null;
-// String orderNo = null;
-// String matnr = null;
-// String specs = null;
-// String zpallet = null;
-// String batch = null;
-// Double anfme = null;
-// Date modiTimeStart = null, modiTimeEnd = null;
-// for (Map.Entry<String, Object> entry : param.entrySet()) {
-// String val = String.valueOf(entry.getValue());
-// if (Cools.isEmpty(val)) {
-// continue;
-// }
-// if (val.contains(RANGE_TIME_LINK)) {
-// String[] dates = val.split(RANGE_TIME_LINK);
-// modiTimeStart = DateUtils.convert(dates[0]);
-// modiTimeEnd = DateUtils.convert(dates[1]);
-// } else if (entry.getKey().equals("wrk_no")) {
-// wrkNo = Integer.parseInt(val);
-// } else if (entry.getKey().equals("order_no")) {
-// orderNo = val;
-// } else if (entry.getKey().equals("specs")) {
-// specs = val;
-// } else if (entry.getKey().equals("zpallet")) {
-// zpallet = val;
-// } else if (entry.getKey().equals("batch")) {
-// batch = val;
-// } else if (entry.getKey().equals("anfme")) {
-// anfme = Double.parseDouble(val);
-// }else if (entry.getKey().equals("matnr")) {
-// matnr = val;
-// }
-// }
-// List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
-// Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
-// page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
-// return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index d2336a9..7a37f37 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -12,7 +12,6 @@
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -51,8 +50,6 @@
} else {
wrapper.orderBy("io_time", false);
}
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 8825627..7d83c8d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -12,7 +12,6 @@
import com.core.common.R;
import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.service.WrkMastLogService;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -54,8 +53,6 @@
} else {
wrapper.orderBy("modi_time", false);
}
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index fcdddfe..e0b24c2 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -24,6 +24,8 @@
@Data
public static class CombMat {
+ //璁㈠崟鏄庣粏鐨勪富閿甶d
+ private Long detlId;
// 鏉＄爜
private String threeCode;
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 72a0903..406324a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -36,7 +36,7 @@
int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("workQty") Double workQty);
- int increaseWorkQty2(@Param("id") Long id, @Param("workQty") Double workQty);
+ int increaseWorkQtyById(@Param("id") Long id, @Param("workQty") Double workQty);
/**
* 鏌ヨ鎵撳嵃璁㈠崟鏄庣粏浜岀淮鐮佹暟鎹�
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 953f8d1..796adea 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -7,10 +7,6 @@
import com.zy.asrs.entity.OrderDetl;
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.pdaAdjustParam;
-import com.zy.asrs.third.CodeDataParam;
-import com.zy.asrs.third.CodeParam;
import java.util.Date;
import java.util.List;
@@ -49,9 +45,6 @@
void leftoversOut(Map<String, Object> map, Long userId);
-
-
- List<CodeDataParam> getData(Map<String, Object> token, CodeParam codeParam);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 2bbe8f0..d3c3359 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -39,5 +39,5 @@
*/
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
- boolean increaseWorkQty2(Long id, Double workQty);
+ boolean increaseWorkQtyById(Long id, Double workQty);
}
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 cfbc7fb..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,13 +7,12 @@
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.service.*;
-import com.zy.asrs.third.CodeDataParam;
-import com.zy.asrs.third.CodeParam;
-import com.zy.asrs.third.MesResponse;
-import com.zy.asrs.third.TokenUtils;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.AgvSiteConstant;
import com.zy.common.constant.ApiInterfaceConstant;
@@ -29,9 +28,6 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -137,12 +133,7 @@
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;
@@ -158,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);
}
@@ -192,12 +175,7 @@
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)) {
@@ -210,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);
}
@@ -242,12 +212,7 @@
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;
@@ -259,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);
}
@@ -281,32 +238,26 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- HashMap<String, Object> comData = new HashMap<>();
- 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 (comData.get(elem.getThreeCode()) == null) {
- comData.put(elem.getThreeCode(), elem);
- } else {
- throw new CoolException(elem.getThreeCode() + "璇ユ潯鐮佹壂鐮佷簡澶氭");
- }
- });
-
+// 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() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
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) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + 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();
@@ -317,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("three_code", elem.getThreeCode())) > 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());
@@ -344,8 +286,8 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setSku(detlDto.getBatch());
- //waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setTemp2(detlDto.getTemp2());
+ waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
@@ -360,135 +302,53 @@
}
// 鍏宠仈缁勬墭
} 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<>();
-
- List<String> codes = new ArrayList<>();
- for (CombParam.CombMat elem : param.getCombMats()) {
- codes.add(elem.getThreeCode());
- }
- List<CodeDataParam> data = getData(TokenUtils.getToken(url), new CodeParam(codes));
- List<CombParam.CombMat> combMats = param.getCombMats();
- for (int i = 0; i < data.size(); i++) {
-
- //}
- //for (CombParam.CombMat elem : param.getCombMats()) {
- CombParam.CombMat elem = combMats.get(i);
- CodeDataParam codeDataParam = data.get(i);
-
- elem.setTemp1(codeDataParam.getQuality());
- elem.setAnfme(codeDataParam.getQty());
- //elem.setBatch(codeDataParam.getBatchNum());
- elem.setThreeCode(codeDataParam.getBarcode());
- elem.setMatnr(codeDataParam.getProductionCode());
- elem.setMaktx(codeDataParam.getProductionName());
-// param.getCombMats().forEach(elem -> {
+ param.getCombMats().forEach(elem -> {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- if (Cools.isEmpty(orderDetl)) {
- orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), null);
- if (Cools.isEmpty(orderDetl)){
- throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
- }
- }
- if (Cools.isEmpty(codeDataParam.getQuality())) {
- throw new CoolException("鏉＄爜鏈繑鍥炶川閲忕姸鎬�");
- }
- if (Integer.parseInt(codeDataParam.getQuality()) != orderDetl.getInspect()) {
- throw new CoolException("鍗曟嵁璐ㄩ噺鐘舵�佸拰缁勬墭鐗╂枡涓嶅尮閰�");
- }
+ OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty2(orderDetl.getId(), 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(), elem.getThreeCode()
- , orderDetl.getManu(), codeDataParam.getBatchNum(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
- detlDto.setTemp1(codeDataParam.getQuality());
- detlDto.setFromOrderNo(codeDataParam.getBarcode());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getFromOrderNo());
- 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.setSku(detlDto.getBatch());
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.setDanger(detlDto.getDanger());
- waitPakin.setManu(detlDto.getMark()); //鏍囪
- waitPakin.setOrigin(order.getItemName());//浠撳簱
- waitPakin.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
- waitPakin.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
- waitPakin.setThreeCode(detlDto.getFromOrderNo()); //鏉＄爜
- waitPakin.setTemp1(detlDto.getTemp1());
- waitPakin.setTemp2(detlDto.getTemp2());
- waitPakin.setTemp3(detlDto.getTemp3());
- waitPakin.setTemp4(detlDto.getTemp4());
- int countWrk2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countWrk2 > 0) {
- throw new CoolException("宸ヤ綔妗ｆ潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode());
- }
+
+ waitPakin.setBatch(orderDetl.getBatch());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
- }
+ });
+
orderService.updateSettle(order.getId(), 2L, userId);
}
}
-
- public List<CodeDataParam> getData(Map<String, Object> token, CodeParam codeParam) {
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(token)
- .setUri(url)
- .setPath(code)
- .setJson(JSON.toJSONString(codeParam))
- .build()
- .doPost();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- log.info("getData:{}", response);
- MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
- if (jsonObject.getCode().equals(200)) {
- JSONObject jsonObject1 = JSON.parseObject(jsonObject.getData());
- if (jsonObject1.getString("barcodeList") != null) {
- return JSON.parseArray(jsonObject1.getString("barcodeList"), CodeDataParam.class);
- }
- }
- throw new CoolException(jsonObject.getMessage());
- }
@Override
@Transactional
@@ -506,8 +366,7 @@
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- 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() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
@@ -563,7 +422,6 @@
}
-
// 鏌ユ壘鍟嗗搧
@@ -656,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();
@@ -829,13 +686,11 @@
}
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()));
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", locMast.getCrnNo()));
if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")) {
continue;
}
@@ -860,8 +715,7 @@
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
- Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo)
- .eq("matnr", orderDetl.getMatnr());
+ Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", orderDetl.getMatnr());
if (!Cools.isEmpty(orderDetl.getBatch())) {
wrapper.eq("batch", orderDetl.getBatch());
}
@@ -937,19 +791,13 @@
}
-
-
@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)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 05e1960..19668f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -92,7 +92,7 @@
}
@Override
- public boolean increaseWorkQty2(Long id, Double workQty) {
- return this.baseMapper.increaseWorkQty2(id, workQty) > 0;
+ public boolean increaseWorkQtyById(Long id, Double workQty) {
+ return this.baseMapper.increaseWorkQtyById(id, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index c5bcbfd..54693d4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -491,7 +491,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increaseWorkQty2(orderDetl.getId(), locDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQtyById(orderDetl.getId(), locDto.getAnfme())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
deleted file mode 100644
index 9fe4ff7..0000000
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.zy.asrs.task;
-
-import com.core.common.Cools;
-import com.zy.asrs.task.handler.BareBoardHandler;
-import com.zy.common.properties.SlaveWmsParameterProperties;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.25
- * 骞垮痉瀹滅..............浠ヤ笅.............骞垮痉瀹滅.............鑷姩琛ョ┖鏉垮啀浼樺寲
- */
-@Component
-public class BareBoardScheduler {
-
- @Autowired
- private BareBoardHandler bareBoardHandler;
- @Autowired
- private ConfigService configService;
- @Autowired
- private SlaveWmsParameterProperties slaveWmsParameterProperties;
-
- /*
- * 鑷姩璋冪┖鏉垮嚭搴�
- * */
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute() {
- if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()) {
- Config config = configService.selectConfigByCode("AutomaticFillingBoard");
- if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("true")) {
- for (Integer staNo : slaveWmsParameterProperties.getAutomaticFillingBoardStaNos()) {
- bareBoardHandler.start(110, staNo, "D");
- }
- }
- }
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
deleted file mode 100644
index 766e6f5..0000000
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WorkService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.CheckDeepHandler;
-import com.zy.common.properties.SlaveProperties;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-
-@Component
-@Slf4j
-public class CheckDeepScheduler {
-
- @Value("${wcs-slave.doubleDeep}")
- private boolean confirmDeep;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private WorkService workService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private SlaveProperties slaveProperties;
-
- @Autowired
- private CheckDeepHandler checkDeepHandler;
-
- /**
- * 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
- */
-// @Scheduled(cron = "0/30 * * * * ?")
- private void execute() throws ParseException {
-// if (!confirmDeep) return;
- if (true) return;
-
- ReturnT<String> result = checkDeepHandler.start();
- if (!result.isSuccess()) {
- log.error("搴撲綅绉昏浆===>>娴呭簱浣嶇Щ杞埌娣卞簱浣嶅け璐�");
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
deleted file mode 100644
index b2b3df8..0000000
--- a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.zy.asrs.task;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.param.ShuttleTask;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.ErrorStockHandler;
-import com.zy.common.utils.HttpHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class ErrorStockScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(ErrorStockScheduler.class);
-
- @Autowired
- private ErrorStockHandler errorStockHandler;
- @Autowired
- private LocMastService locMastService;
-
- @Value("${shuttleWcs.url}")
- private String shuttleWcsUrl;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute() {
- ReturnT<String> returnT = errorStockHandler.start();
- if (!returnT.isSuccess()) {
- log.error(returnT.getMsg());
- }
- }
-
-// @Scheduled(cron = "0/15 * * * * ? ")
-// private void execute2() {
-// String response = null;
-// try {
-// ShuttleTask param = new ShuttleTask();
-// response = new HttpHandler.Builder()
-// .setUri(shuttleWcsUrl)
-// .setJson(JSON.toJSONString(param))
-// .setPath("/openapi/getAllLocInformation")
-// .build()
-// .doPost();
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// JSONObject jsonObject = JSON.parseObject(response);
-// Integer code = jsonObject.getInteger("code");
-// if (code.equals(200)) {
-// String data = jsonObject.getString("data");
-// List<LocMast> locMasts = JSONArray.parseArray(data, LocMast.class);
-// for (LocMast locMast : locMasts) {
-// if (locMast.getLocNo().startsWith("02003") || locMast.getLocNo().startsWith("12003")) {
-// continue;
-// }
-// String locNo = locMast.getLocNo();
-// int row = Integer.parseInt(locNo.substring(0, 2)) + 4;
-// if (row >= 10) {
-// locNo = row + locMast.getLocNo().substring(2);
-// } else {
-// locNo = "0" + row + locMast.getLocNo().substring(2);
-// }
-// LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
-// if (locMast1 == null) {
-// log.info("搴撲綅涓嶅尮閰�");
-// } else {
-// if (locMast1.getLocSts().equalsIgnoreCase("X")) {
-//
-// } else if (!locMast1.getLocSts().equalsIgnoreCase(locMast.getLocSts())) {
-// log.info("搴撲綅鐘舵�佷笉鍖归厤{}锛學MS:{}锛孯CS:{}", locMast1.getLocNo(), locMast1.getLocSts(), locMast.getLocSts());
-// }
-// }
-// }
-// }
-// }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java b/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
deleted file mode 100644
index 9d51ef4..0000000
--- a/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.NotifyLogHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class NotifyLogScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(NotifyLogScheduler.class);
-
- @Autowired
- private NotifyLogHandler notifyLogHandler;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute() {
- ReturnT<String> returnT = notifyLogHandler.start();
- if (!returnT.isSuccess()) {
- log.error(returnT.getMsg());
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 2e0425f..37bdcda 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -11,7 +11,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.third.TokenUtils;
import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -52,126 +51,7 @@
@Transactional
public ReturnT<String> start(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- //List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
- // 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1 && !Cools.isEmpty(orderDetls)) {
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setReceiptNumber(order.getOrderNo());
- pakinParam.setReceiptType(order.getDocType$());
- pakinParam.setCompleteInd("1");
- for (OrderDetlReport orderDetl : orderDetls) {
- MesPakinParam.Detl detl = new MesPakinParam.Detl();
- detl.setQty(orderDetl.getAnfme());
- detl.setBarcode(orderDetl.getThreeCode());
- detl.setPalletBarcode(orderDetl.getZpallet());
- detl.setProductionCode(orderDetl.getMatnr());
- pakinParam.getBarcodeList().add(detl);
- }
- Map<String, Object> token = TokenUtils.getToken(url);
- if (Cools.isEmpty(token)) {
- return FAIL.setMsg("鑾峰彇token澶辫触");
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(token)
- .setUri(url)
- .setPath(pakin)
- .setJson(JSON.toJSONString(pakinParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + pakin, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- url + pakin,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakinParam),
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- }
- // 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
-// MesPakoutParam pakoutParam = new MesPakoutParam();
-// pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
-// pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
-// pakoutParam.setLgortFrom("5006");
-// pakoutParam.setLgortTo("1111");
-// if (!pakoutParam.isTag()) {
-// pakoutParam.setKunnr("C1000");
-// }
-// pakoutParam.setOrderNo(order.getOrderNo());
-// for (OrderDetl orderDetl : orderDetls) {
-// String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
-// pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
-// }
-// String response = "";
-// boolean success = false;
-// try {
-// response = new HttpHandler.Builder()
-// .setUri(MesConstant.URL)
-// .setPath(MesConstant.PAKOUT_URL)
-// .setJson(JSON.toJSONString(pakoutParam))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
-// success = true;
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
-// } else {
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
-// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
-// }
-// } catch (Exception e) {
-// log.error("fail", e);
-//// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// return FAIL.setMsg(e.getMessage());
-// } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鎴愬搧搴撳嚭搴撲笂鎶�",
-// MesConstant.URL + MesConstant.PAKOUT_URL,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(pakoutParam),
-// response,
-// success
-// );
-// } catch (Exception e) { log.error("", e); }
-// }
- }
+
return SUCCESS;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 9a64985..d72e788 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -69,36 +69,15 @@
// exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
-// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
-// if (!Cools.isEmpty(wrkDetls)) {
-// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
-// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// }
// 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
-// if (!Cools.isEmpty(wrkDetls)) {
-// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
-// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// }
+
}
// 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
-// if (!Cools.isEmpty(wrkDetls)) {
-// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
-// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// }
+
}
-
-
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
-// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-
Date now = new Date();
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
WrkMastLog wrkMastLog = new WrkMastLog();
@@ -124,9 +103,6 @@
}
});
-// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-//// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
deleted file mode 100644
index b665cc7..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.zy.asrs.task.kingdee.handler.InboundOrderHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class InboundOrderScheduler {
-
- @Autowired
- private InboundOrderHandler inboundOrderHandler;
- @Value("${erp.switch.InboundOrderSwitch}")
- private boolean InboundOrderSwitch;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- void login() {
- if (!InboundOrderSwitch) {
- return;
- }
- inboundOrderHandler.start();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
deleted file mode 100644
index 46bc690..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.zy.asrs.task.kingdee.handler.LoginAuthenticationHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class LoginAuthenticationScheduler {
-
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
- @Value("${erp.switch.LoginAuthenticationSwitch}")
- private boolean LoginAuthenticationSwitch;
-
- //@Scheduled(cron = "0/3 * * * * ? ")
- void login() {
- if (!LoginAuthenticationSwitch) {
- return;
- }
- loginAuthenticationHandler.start();
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
deleted file mode 100644
index 60e9a86..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2023/10/21
- */
-@Slf4j
-@Component
-public class ReviewOrderSyncScheduler {
-
- @Autowired
- private ReviewOrderSyncHandler reviewOrderSyncHandler;
- @Autowired
- private OrderService orderService;
-
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport() {
- if (!ReviewOrderSwitch) {
- return;
- }
- List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
- ReturnT<String> result = reviewOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
deleted file mode 100644
index b701a89..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Component
-public class SaveOrderSyncScheduler {
-
- @Autowired
- private SubmitOrderSyncHandler submitOrderSyncHandler;
- @Autowired
- private OrderService orderService;
-
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
-
- // @Scheduled(cron = "0/3 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport() {
- if (1 == 1) return;
- if (!ReviewOrderSwitch) {
- return;
- }
- List<Order> orders = orderService.selectComplete8();
- for (Order order : orders) {
- ReturnT<String> result = submitOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
deleted file mode 100644
index 7d73669..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zy.asrs.task.kingdee;
-
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Component
-public class SubmitOrderSyncScheduler {
-
- @Autowired
- private SaveOrderSyncHandler saveOrderSyncHandler;
- @Autowired
- private OrderService orderService;
-
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport() {
- if (!ReviewOrderSwitch) {
- return;
- }
- List<Order> orders = orderService.selectComplete8();
- for (Order order : orders) {
- ReturnT<String> result = saveOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
- }
- }
- }
-
-}
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
deleted file mode 100644
index f8fd107..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.entity.param.InFormIdParam;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import com.zy.erp.kingdee.utils.KingDeeUtil;
-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 java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-
-@Service
-@Slf4j
-public class InboundOrderHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.inaddress}")
- //鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
- private String inaddress;
-
- @Autowired
- private ApiLogService apiLogService;
-
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Autowired
- private MatService matService;
-
- @Autowired
- private TagService tagService;
-
- @Autowired
- private DocTypeService docTypeService;
-
- @Autowired
- private OrderService orderService;
-
- @Autowired
- private OrderDetlService orderDetlService;
-
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
-
- @Transactional
- public synchronized ReturnT<String> start() {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- //鐧诲綍閲戣澏
- ReturnT<String> start = loginAuthenticationHandler.start();
- for (KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
- InFormIdParam inFormIdParam = new InFormIdParam();
- DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", kingDeeUtilType.desc));
- if (Cools.isEmpty(docType) && !kingDeeUtilType.formId.equals("BD_MATERIAL")) {
- docType = docTypeService.selectOrAdd(kingDeeUtilType.desc, kingDeeUtilType.pakIn.equals(1));
- }
- inFormIdParam.setFormId(kingDeeUtilType.formId);
- inFormIdParam.setLimit(100);
- inFormIdParam.setStartRow("0");
- String FDocumentStatus = null;
-
- //鏉′欢鍜岄渶瑕佽幏寰楃殑缁撴灉鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("FormId", inFormIdParam.getFormId());
- jsonObject.put("Limit", inFormIdParam.getLimit());
- jsonObject.put("StartRow", inFormIdParam.getStartRow());
- //鐗╂枡妗ｆ鏌ヨ
- if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
- Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- //鐗╂枡鐘舵�� FUseOrgId .FNumber
- FDocumentStatus = "C";
- jsonObject.put("FilterString", "FCreateDate>'" + sdf.format(tag.getUpdateTime()) + "' and FDocumentStatus='" + FDocumentStatus + "' and FUseOrgId .FNumber='100'");
- jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus");
- // FName : 鐗╂枡鍚嶇О 锛�
- // FNumber 锛氱墿鏂欑紪鍙凤紱
- // FCreateDate 锛氱墿鏂欏垱寤烘椂闂达紱
- // FSpecification 锛氱墿鏂欒鏍硷紱
- // FDocumentStatus 锛氱墿鏂欑姸鎬�
- } else {
- //鑾峰彇鏈�鏂版椂闂�
- //鍗曟嵁鐘舵��
- FDocumentStatus = "B";
- jsonObject.put("FilterString", "FCreateDate>'" + sdf.format(docType.getCreateTime()) + "'" + " and FStockId.Fname='绔嬪簱'" + " and FDocumentStatus='" + FDocumentStatus + "'");
- jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification," + kingDeeUtilType.anfme + ",FDocumentStatus");
- // FBillNo :鍗曟嵁缂栧彿锛�
- // FCreateDate 锛氬崟鎹垱寤烘椂闂达紱
- // FMaterialId.FNumber : 鐗╂枡缂栫爜锛�
- // FMaterialName 锛氱墿鏂欏悕绉帮紱
- // FMaterialId.FSpecification锛氱墿鏂欒鏍�
- // anfme : 鐗╂枡鏁伴噺
- // FDocumentStatus 锛氬崟鎹姸鎬侊紱
-
- }
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(inaddress)
- .setJson(add)
- .build()
- .doPost();
- JSONArray data = JSON.parseArray(response);
- if (data.size() <= 0) continue;
- if (data.getJSONArray(0).get(0).toString().length() >= 20) continue;
- if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {//鐗╂枡妗ｆ
- Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(2).toString());
- //鐢熸垚鍟嗗搧妗ｆ
- //鍟嗗搧缂栧彿
- Mat mat = matService.selectByMatnr(jsonArray.get(1).toString());
- if (mat == null) {
- mat = new Mat();
- mat.setMatnr(jsonArray.get(1).toString());
- mat.setMaktx(jsonArray.get(0).toString());
- mat.setSpecs(jsonArray.get(3).toString());//瑙勬牸
- mat.setTagId(tag.getId());
- mat.setCreateTime(jsonDate);//鍟嗗搧鍒涘缓鏃堕棿
- mat.setUpdateTime(new Date());
- mat.setStatus(1);
- //鏈�鏂版姄鍙栧晢鍝佹椂闂�
- if (!matService.insert(mat)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- callApiLogSaveMat(mat, kingDeeUtilType, "鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒" + mat, false);
- log.info("鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒鍙傛暟锛歔{}]銆乕{}]", mat, jsonArray);
- } else {
- callApiLogSaveMat(mat, kingDeeUtilType, "鍚屾鏂扮墿鏂欙紒", true);
-// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
- }
- } else {
- if (!jsonDate.equals(tag.getUpdateTime())) {
- callApiLogSaveMat(mat, kingDeeUtilType, "鍟嗗搧缂栧彿閲嶅:" + mat.getMatnr(), false);
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}],鍟嗗搧缂栧彿閲嶅锛侊紒锛�", mat.getMatnr());
- }
- }
- tag.setUpdateTime(jsonDate);
- }
- tagService.updateById(tag);
- } else {
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- //鏈�鏂版姄鍙栨椂闂�
- Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(1).toString());
- docType.setCreateTime(jsonDate);
- Order order = orderService.selectByNo(jsonArray.get(0).toString());
- if (Cools.isEmpty(order)) {
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- jsonArray.get(0).toString(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
-
- if (!orderService.insert(order)) {
- if (!jsonDate.equals(docType.getCreateTime())) {
- callApiLogSaveOrder(order, kingDeeUtilType, "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�" + order, false);
- }
- continue;
-// throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- //鐗╂枡缂栫爜
- Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
- if (Cools.isEmpty(mat)) {
- if (!jsonDate.equals(docType.getCreateTime())) {
- callApiLogSaveOrder(order, kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧" + jsonArray.get(2).toString(), false);
- }
- continue;
- }
- OrderDetl orderDetl1 = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", jsonArray.get(0).toString()).eq("matnr", jsonArray.get(2).toString()));
- if (!Cools.isEmpty(orderDetl1)) {
- continue;
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(null);
- orderDetl.setAnfme(Double.parseDouble(jsonArray.get(5).toString()));
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(new Date());
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(new Date());
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- callApiLogSaveOrder(order, kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!璁㈠崟鍙凤細" + order.getOrderNo(), false);
-// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- docTypeService.updateById(docType);
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "杞鏁版嵁",
-// URL + inaddress,
-// null,
-// "127.0.0.1",
-// add,
-// response,
-// success
-// );
-// } catch (Exception e) {
-// log.error("", e);
-// }
- }
- }
- return SUCCESS;
- }
-
- public void callApiLogSaveMat(Mat mat, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
- apiLogService.save("鑾峰彇" + kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "鐗╂枡缂栧彿锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getName() + "銆佺被鍨嬶細" + mat.getTagId$() + "銆佺姸鎬侊細" + mat.getStatus$(),
- response, bool);
- }
-
- public void callApiLogSaveOrder(Order order, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
- apiLogService.save("鑾峰彇" + kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "鍗曟嵁缂栧彿锛�" + order.getId() + "銆佺姸鎬侊細" + order.getStatus$(),
- response, bool);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
deleted file mode 100644
index 45315a3..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.Cools;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.entity.param.LoginParam;
-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 java.util.Set;
-
-@Service
-@Slf4j
-@Transactional
-public class LoginAuthenticationHandler extends AbstractHandler<String> {
-
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.loginaddress}")
- //鐧诲綍鍦板潃
- private String loginaddress;
-
- @Value("${erp.login.acctID}")
- //璐﹀彿ID
- private String acctID;
-
- @Value("${erp.login.username}")
- //璐﹀彿
- private String username;
-
- @Value("${erp.login.password}")
- //瀵嗙爜
- private String password;
-
- @Value("${erp.login.lcid}")
- //
- private Integer lcid;
-
- @Autowired
- private ApiLogService apiLogService;
-
- /**
- * 45鍒嗛挓鐧诲綍涓�娆￠噾铦剁郴缁�
- *
- * @return
- */
- @Transactional
- public synchronized ReturnT<String> start() {
-
- LoginParam loginParam = new LoginParam();
- loginParam.setAcctID(acctID);
- loginParam.setUsername(username);
- loginParam.setPassword(password);
- loginParam.setLcid(lcid);
- //涓婃姤
- String response = "";
- String cookie = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(URL)
- .setPath(loginaddress)
- .setJson(JSON.toJSONString(loginParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Object sessionId = findValueByKey(JSON.parseObject(response), "SessionId");
- cookie = "ASP.NET_SessionId=" + sessionId + ";" + "kdservice-sessionid=" + jsonObject.getString("KDSVCSessionId");
- if (Cools.isEmpty(jsonObject.getString("Message"))) {
- success = true;
- } else {
- callApiLogSaveLog(JSON.toJSONString(loginParam), false);
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + loginaddress, JSON.toJSONString(loginParam), response);
-// throw new CoolException("鐧诲綍閲戣澏澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- callApiLogSaveLog(JSON.toJSONString(loginParam), false);
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + loginaddress, JSON.toJSONString(loginParam), response);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鐧诲綍閲戣澏",
-// URL + loginaddress,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(loginParam),
-// response,
-// success
-// );
-// } catch (Exception e) { log.error("", e); }
- }
- return SUCCESS.setContent(cookie);
- }
-
-
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null) {
- return result;
- }
- }
- } else if (v instanceof JSONObject) {
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null) {
- return result;
- }
- }
- }
- return null;
- }
-
- public void callApiLogSaveLog(String response, Boolean bool) {
- apiLogService.save("鐧诲綍閲戣澏澶辫触", URL, "null", loginaddress,
- "濂楄处ID锛�" + acctID + "銆佽处鍙凤細" + username + "銆佸瘑鐮侊細" + password,
- response, bool);
- }
-
-
-}
-
-
-
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
deleted file mode 100644
index e8bb394..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-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 java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by vincent on 2023/10/21
- */
-@Slf4j
-@Service
-public class ReviewOrderSyncHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.outaddressAudit}")
- //瀹℃牳鍦板潃
- private String outaddressAudit;
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Transactional
- public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers", order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId", kingDeeUtilType.formId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(outaddressAudit)
- .setJson(add)
- .build()
- .doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool = IsSuccess.toString();
- //瀹℃牳瀹屾垚鍘熻鍗�4杞�8 8.瀹℃牳瀹屾垚
- if (bool.equals("true")) {
- success = true;
- order.setSettle(8L);
- orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "瀹℃牳",
- URL + outaddressAudit,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
-
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null) {
- return result;
- }
- }
- } else if (v instanceof JSONObject) {
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null) {
- return result;
- }
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
deleted file mode 100644
index 0518557..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-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 java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Service
-public class SaveOrderSyncHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.outaddressSave}")
- //瀹℃牳鍦板潃
- private String outaddressSave;
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Transactional
- public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers", order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId", kingDeeUtilType.correspondingFormId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(outaddressSave)
- .setJson(add)
- .build()
- .doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool = IsSuccess.toString();
- //淇濆瓨瀹屾垚鍘熻鍗�8杞�6
- if (bool.equals("true")) {
- success = true;
- order.setSettle(6L);
- orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "淇濆瓨",
- URL + outaddressSave,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
-
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null) {
- return result;
- }
- }
- } else if (v instanceof JSONObject) {
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null) {
- return result;
- }
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
deleted file mode 100644
index 001d2b1..0000000
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zy.asrs.task.kingdee.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
-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 java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by Monkey D. Luffy on 2023.10.21
- */
-@Slf4j
-@Service
-public class SubmitOrderSyncHandler extends AbstractHandler<String> {
- @Value("${erp.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${erp.address.outaddressSubmit}")
- //瀹℃牳鍦板潃
- private String outaddressSubmit;
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private LoginAuthenticationHandler loginAuthenticationHandler;
-
- @Transactional
- public ReturnT<String> start(Order order) {
- //鐧诲綍閲戣澏r
- ReturnT<String> start = loginAuthenticationHandler.start();
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
- //鏉′欢鎷兼帴
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers", order.getOrderNo());
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId", kingDeeUtilType.correspondingFormId);
- String add = jsonObject1.toJSONString();
- //涓婃姤
- String response = "";
- boolean success = false;
- try {
- //鑾峰彇Cookie鍊�
- HashMap<String, Object> headers = new HashMap<>();
- headers.put("Cookie", start.getContent());
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri(URL)
- .setPath(outaddressSubmit)
- .setJson(add)
- .build()
- .doPost();
- JSONObject data = JSON.parseObject(response);
- Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool = IsSuccess.toString();
- //瀹℃牳瀹屾垚鍘熻鍗�8杞�6
- if (bool.equals("true")) {
- success = true;
- order.setSettle(6L);
- orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎻愪氦",
- URL + outaddressSubmit,
- null,
- "127.0.0.1",
- add,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return SUCCESS;
- }
-
- public static Object findValueByKey(JSONObject json, String key) {
- Set<String> keySet = json.keySet();
- for (String k : keySet) {
- Object v = json.get(k);
- if (k.equals(key)) {
- return v;
- } else if (v instanceof JSONArray) {
- int size = ((JSONArray) v).size();
- for (int i = 0; i <= size - 1; i++) {
- Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null) {
- return result;
- }
- }
- } else if (v instanceof JSONObject) {
- Object result = findValueByKey((JSONObject) v, key);
- if (result != null) {
- return result;
- }
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/asrs/third/CodeDataParam.java b/src/main/java/com/zy/asrs/third/CodeDataParam.java
deleted file mode 100644
index fa112cc..0000000
--- a/src/main/java/com/zy/asrs/third/CodeDataParam.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.third;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class CodeDataParam implements Serializable {
- private String barcode;
- private String productionCode;
- private String productionName;
- private String productionStandard;
- private String batchNum;
- private Double qty;
- private String quality;
-
-}
diff --git a/src/main/java/com/zy/asrs/third/CodeParam.java b/src/main/java/com/zy/asrs/third/CodeParam.java
deleted file mode 100644
index d56181b..0000000
--- a/src/main/java/com/zy/asrs/third/CodeParam.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zy.asrs.third;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class CodeParam implements Serializable {
- private List<String> barcodeList;
-
- public CodeParam() {
- }
-
- public CodeParam(List<String> threeCodes) {
- this.barcodeList = threeCodes;
- }
-}
diff --git a/src/main/java/com/zy/asrs/third/MesResponse.java b/src/main/java/com/zy/asrs/third/MesResponse.java
deleted file mode 100644
index 226274e..0000000
--- a/src/main/java/com/zy/asrs/third/MesResponse.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.third;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class MesResponse implements Serializable {
- private String message;
- private Integer code;
- private String data;
-}
diff --git a/src/main/java/com/zy/asrs/third/TokenUtils.java b/src/main/java/com/zy/asrs/third/TokenUtils.java
deleted file mode 100644
index 3ec9ab6..0000000
--- a/src/main/java/com/zy/asrs/third/TokenUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.zy.asrs.third;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-public class TokenUtils {
-
- private static String erpId = "1130021";
-
- private static String clientId = "xincai";
-
- private static String clientSecret = "123456";
-
- //private static String erpId = "1933048022695026688";
-
- private static String tokenUrl = "/mes-data/getMsg/v2/createToken";
-
- public static Map<String, Object> getToken(String ip) {
- Map<String, Object> data = new HashMap<>();
- Map<String, String> tokenData = new HashMap<>();
- tokenData.put("clientId", clientId);
- tokenData.put("clientSecret", clientSecret);
- tokenData.put("erpId", erpId);
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setUri(ip)
- .setPath(tokenUrl)
- .setJson(JSON.toJSONString(tokenData))
- .build()
- .doPost();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- log.info("token:{}", response);
- MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
- if (jsonObject.getCode().equals(200)) {
- data.put("token", JSON.parseObject(jsonObject.getData()).getString("token"));
- }
- return data;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/utils/InitStaDesc.java b/src/main/java/com/zy/asrs/utils/InitStaDesc.java
deleted file mode 100644
index ee64390..0000000
--- a/src/main/java/com/zy/asrs/utils/InitStaDesc.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.zy.asrs.utils;
-
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.service.StaDescService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by vincent on 2022/5/8
- */
-//@Component
-@RestController
-public class InitStaDesc {
-
- @Autowired
- private StaDescService staDescService;
-
- // @PostConstruct
- @GetMapping("/init/staDesc")
- public void initStaDesc() {
- in();
- out();
- }
-
- public void in() {
- // 鍏ㄧ彮鍏ュ簱
- int[] stnNos = new int[]{305, 303, 301};
- int[] crnStns = new int[]{321, 320, 319, 318, 317, 316, 315, 314, 313, 311, 309, 307};
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(1);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 绌烘澘鍏ュ簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(10);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鎷ｆ枡鍏ュ簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(53);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鐩樼偣鍏ュ簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(57);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- }
-
- public void out() {
- // 鍏ㄧ彮鍑哄簱
- int[] stnNos = new int[]{304, 302, 300};
-// int[] crnStns = new int[] {321, 320, 319, 318, 317, 316, 315, 314};
- int[] crnStns = new int[]{312, 310, 308, 306};
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(101);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 绌烘澘鍑哄簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(110);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鎷ｆ枡鍑哄簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(103);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鐩樼偣鍑哄簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(107);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- }
-
-
-// public void in() {
-// // 鍏ㄧ彮鍏ュ簱
-// int[] stnNos = new int[] {173, 176, 180, 185, 189, 194, 198, 202, 206, 211, 215, 219, 223, 226};
-// int[] crnStns = new int[] {123, 121, 119, 117, 115, 113, 111, 109, 107, 105, 103, 101};
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(1);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 绌烘澘鍏ュ簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(10);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鎷ｆ枡鍏ュ簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(53);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鐩樼偣鍏ュ簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(57);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// }
-//
-// public void out() {
-// // 鍏ㄧ彮鍑哄簱
-// int[] stnNos = new int[] {174, 177, 181, 186, 190, 195, 199, 203, 207, 212, 216, 220, 224, 227};
-// int[] crnStns = new int[] {122, 120, 118, 116, 114, 112, 110, 108, 106, 104, 102, 100};
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(101);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 绌烘澘鍑哄簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(110);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鎷ｆ枡鍑哄簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(103);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鐩樼偣鍑哄簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(107);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// }
-
-}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a94e7c2..8b3a841 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -22,30 +22,6 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static String getStaName(Integer sta) {
- HashMap<Integer, String> map = new HashMap<>();
- map.put(113, "Ctu搴�102");
- map.put(115, "Ctu搴�101");
- map.put(204, "Ctu搴�201");
- map.put(304, "Ctu搴�301");
- map.put(31001, "鍥涘悜搴�101");
-
- map.put(1024, "鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");
- map.put(1028, "鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛");
- map.put(1040, "鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");
- map.put(1042, "鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛");
-
- map.put(2000, "鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");
- map.put(2002, "鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛");
- map.put(2010, "鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");
- map.put(2012, "鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛");
-
-
- map.put(3010, "鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");
- map.put(3012, "鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
-
- return map.get(sta) == null ? sta.toString() : map.get(sta);
- }
public static boolean isNorth(Integer sourceStaNo) {
if ((sourceStaNo > 1000 && sourceStaNo < 1040) || (sourceStaNo > 2000 && sourceStaNo > 2010) || (sourceStaNo > 3000 && sourceStaNo < 3010)) {
diff --git a/src/main/java/com/zy/common/utils/RoleUtils.java b/src/main/java/com/zy/common/utils/RoleUtils.java
deleted file mode 100644
index e8a6ead..0000000
--- a/src/main/java/com/zy/common/utils/RoleUtils.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.zy.common.utils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import org.springframework.stereotype.Component;
-
-/**
- * @author pang.jiabao
- * @description 鏍规嵁瑙掕壊鍖哄垎涓嶅悓搴撴樉绀轰笉鍚屽簱瀛�
- * @createDate 2024/11/3 14:11
- */
-@Component
-public class RoleUtils {
- /**
- * 浠ヨ鑹茬户鎵胯鑹叉樉绀哄嚭鎸囧畾搴撲俊鎭寜鍫嗗灈鏈洪檺鍒�
- */
- public static <T> String outRole(Long userId) {
- // super璐﹀彿
- if (userId == 9527) {
- return "all";
- }
-
- UserService userService = SpringUtils.getBean(UserService.class);
- User user = userService.selectById(userId);
- String roleName = user.getRoleName();
-
- // 绠＄悊鍛樿鑹�
- if (Cools.isEmpty(roleName)) {
-
- } else if (roleName.equals("绠＄悊鍛�")) {
- return "all";
- }
-
- // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
- String roleLeaderCode = user.getRoleLeaderCode();
- if (Cools.isEmpty(roleLeaderCode)) {
-
- } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
- return "stacker_hangar";
- } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
- return "four_directional_library";
- } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
- return "ctu_library";
-
- }
- return "all";
-
- }
-
-
- /**
- * 浠ヨ鑹茬户鎵胯鑹叉樉绀哄嚭鎸囧畾搴撲俊鎭寜鍫嗗灈鏈洪檺鍒�
- */
- public static <T> void addRoleWrapperByCrn(Long userId, EntityWrapper<T> wrapper) {
- // super璐﹀彿
-// if (userId == 9527) {
-// return;
-// }
-//
-// UserService userService = SpringUtils.getBean(UserService.class);
-// User user = userService.selectById(userId);
-// String roleName = user.getRoleName();
-//
-// // 绠＄悊鍛樿鑹�
-// if (Cools.isEmpty(roleName)) {
-// wrapper.eq("1", 0);
-// } else if (roleName.equals("绠＄悊鍛�")) {
-// return;
-// }
-//
-// // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
-// String roleLeaderCode = user.getRoleLeaderCode();
-// if (Cools.isEmpty(roleLeaderCode)) {
-// wrapper.eq("1", 0);
-// } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
-// wrapper.le("crn_no", 4); // 闄愬埗1~4鍙峰爢鍨涙満
-// } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
-// wrapper.eq("crn_no", 7); // 闄愬埗7鍙峰爢鍨涙満
-// } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
-// wrapper.in("crn_no", 8, 9); //闄愬埗8锛�9鍙峰爢鍨涙満
-// }
-
- }
-
- /**
- * 浠ヨ鑹茬户鎵胯鑹叉樉绀哄嚭鎸囧畾搴撲俊鎭寜搴撲綅闄愬埗
- */
- public static <T> void addRoleWrapperByLocNo(Long userId, EntityWrapper<T> wrapper) {
- // super璐﹀彿
-// if (userId == 9527) {
-// return;
-// }
-//
-// UserService userService = SpringUtils.getBean(UserService.class);
-// User user = userService.selectById(userId);
-// String roleName = user.getRoleName();
-//
-// // 绠＄悊鍛樿鑹�
-// if (Cools.isEmpty(roleName)) {
-// wrapper.eq("1", 0);
-// return;
-// } else if (roleName.equals("绠＄悊鍛�")) {
-// return;
-// }
-//
-// // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
-// String roleLeaderCode = user.getRoleLeaderCode();
-// if (Cools.isEmpty(roleLeaderCode)) {
-// wrapper.eq("1", 0);
-// } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
-// wrapper.addFilter("LEFT(loc_no,2)<=16"); // 闄愬埗1~16鎺�
-// } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
-// wrapper.addFilter("LEFT(loc_no,2)>=17 and LEFT(loc_no,2)<=37"); // 闄愬埗17~37鎺�
-// } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
-// wrapper.addFilter("LEFT(loc_no,2)>=38"); //闄愬埗38~53鎺�
-// }
- }
-
-
- /**
- * 浠ヨ鑹茬户鎵胯鑹叉樉绀哄嚭鎸囧畾搴撲俊鎭寜鎵樼洏鐮侀檺鍒�
- */
- public static <T> void addRoleWrapperByBarcode(Long userId, EntityWrapper<T> wrapper) {
- // super璐﹀彿
-// if (userId == 9527) {
-// return;
-// }
-//
-// UserService userService = SpringUtils.getBean(UserService.class);
-// User user = userService.selectById(userId);
-// String roleName = user.getRoleName();
-//
-// // 绠＄悊鍛樿鑹�
-// if (Cools.isEmpty(roleName)) {
-// wrapper.eq("1", 0);
-// return;
-// } else if (roleName.equals("绠＄悊鍛�")) {
-// return;
-// }
-//
-// // 鍏朵粬瑙掕壊鐪嬬户鎵胯鑹�
-// String roleLeaderCode = user.getRoleLeaderCode();
-// if (Cools.isEmpty(roleLeaderCode)) {
-// wrapper.eq("1", 0);
-// } else if (roleLeaderCode.equals("stacker_hangar")) { // 鍫嗗灈鏈哄簱
-// // TODO 鍫嗗灈鏈哄紑澶存湭纭
-//// wrapper.addFilter("LEFT(zpallet,3) =''"); // 闄愬埗
-// } else if (roleLeaderCode.equals("four_directional_library")) { // 鍥涘悜搴�
-// wrapper.addFilter("LEFT(zpallet,3) ='SXK'"); // 闄愬埗SXK
-// } else if (roleLeaderCode.equals("ctu_library")) { // ctu搴�
-// wrapper.addFilter("LEFT(zpallet,3) ='CTU'"); //闄愬埗CTU
-// }
- }
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
deleted file mode 100644
index 030acad..0000000
--- a/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zy.erp.kingdee.entity.param;
-
-import lombok.Data;
-
-@Data
-public class InFormIdParam {
-
- //鏌ユ壘琛ㄥ崟鍞竴鏍囪瘑
- private String FormId;
-
- //鏈�澶氬厑璁告煡璇㈢殑鏁伴噺锛�0鎴栬�呬笉瑕佹灞炴�ф爣璇嗕笉闄愬埗
- private String TopRowCount;
-
- private Integer Limit;
-
- private String StartRow;
-
- //杩囨护鏉′欢锛坋g:\"FNumber>'0301010120001' and FCreateDate>'2023-07-05' \"锛�
- //1銆丩eft锛氬乏鎷彿
- //3銆丆ompare锛氭瘮杈冭繍绠楃锛屽銆�澶т簬">"銆佸皬浜�"<"銆佺瓑浜�"="銆佸寘鍚�"like"銆佸乏鍖呭惈"llike"銆佸彸鍖呭惈"rlike"
- //4銆乂alue锛氭瘮杈冨��
- //5銆丷ight锛氬彸鎷彿
- //6銆丩ogic锛氶�昏緫杩愮畻绗︼紝濡� "and"銆�"or"
- private Integer Filterstring;
-
- //鎺掑簭鏉′欢
- private Integer OrderString;
-
- //寰呮煡璇㈣〃鍗曠殑瀛楁鍒楋紙鏈熸湜杩斿洖鍊硷級
- private Integer FieldKeys;
-
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
deleted file mode 100644
index 1eb3ee4..0000000
--- a/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.erp.kingdee.entity.param;
-
-import lombok.Data;
-
-@Data
-public class LoginParam {
- //璐﹀彿ID
- private String acctID;
-
- //璐﹀彿
- private String username;
-
- //瀵嗙爜
- private String password;
-
- //
- private Integer lcid;
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
deleted file mode 100644
index cbaeeab..0000000
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.zy.erp.kingdee.enums;
-
-public enum KingDeeUtilType {
- BD_MATERIAL(0, "鐗╂枡妗ｆ", "BD_MATERIAL", "", "", "", 1),
- // STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
-// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
-// PRD_PickMtrl(3, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","FActualQty","","",1),
-// PRD_ReturnMtrl(4, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","FQty","","",1),
-// PRD_FeedMtrl(5, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","FActualQty","","",1),
-// STK_TransferDirect(6, "鐩存帴璋冩嫧鍗�","STK_TransferDirect","","FQty","",1),
-// STK_StockCountGain(7, "鐩樼泩鍗�","STK_StockCountGain","FGainQty","","",1),
-// STK_StockCountLoss(8, "鐩樹簭鍗�","STK_StockCountLoss","FLossQty","","",1),
-// STK_MisDelivery(9, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",1),
-// SP_PickMtrl(10, "绠�鍗曠敓浜ч鏂欏崟","SP_PickMtrl","FActualQty","","",1),
-// SP_ReturnMtrl(11, "绠�鍗曠敓浜ч��鏂欏崟","SP_ReturnMtrl","FQty","","",1),
-// SAL_OUTSTOCK(12, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",1),
-// SAL_RETURNSTOCK(13, "閿�鍞��璐у崟","SAL_RETURNSTOCK","FRealQty","","",1),
- SAL_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�", "SAL_DELIVERYNOTICE", "FQty", "閿�鍞嚭搴撳崟", "SAL_OUTSTOCK", 0),
- STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�", "STK_MISCELLANEOUS", "FQty", "鍏朵粬鍏ュ簱鍗�", "STK_MISCELLANEOUS", 1),
- // BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",1),
- PUR_ReceiveBill(17, "鏀舵枡閫氱煡鍗�", "PUR_ReceiveBill", "FPOQTY", "閲囪喘鍏ュ簱鍗�", "STK_InStock", 1),
- PRD_MORPT(18, "鐢熶骇姹囨姤鍗�", "PRD_MORPT", "FFinishQty", "鐢熶骇鍏ュ簱鍗�", "PRD_INSTOCK", 1),
- // PRD_INSTOCK(19, "鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK","","","",1),
- SAL_RETURNNOTICE(20, "閫�璐ч�氱煡鍗�", "SAL_RETURNNOTICE", "FBaseJunkedQty", "閿�鍞��璐у崟", "SAL_RETURNSTOCK", 1),
- STK_OutStockApply(21, "鍑哄簱鐢宠鍗�", "STK_OutStockApply", "FTotalSecQty", "鍏朵粬鍑哄簱鍗�", "STK_MisDelivery", 0),
- ;
- public Integer id;
- public String desc;
- public String formId;
- public String anfme;
- public String correspondingName;
- public String correspondingFormId;
- public Integer pakIn;
-
- KingDeeUtilType(Integer id, String desc, String formId, String anfme, String correspondingName, String correspondingFormId, int pakIn) {
- this.id = id;
- this.desc = desc;
- this.formId = formId;
- this.anfme = anfme;
- this.correspondingName = correspondingName;
- this.correspondingFormId = correspondingFormId;
- this.pakIn = pakIn; //1鍏ュ簱 0鍑哄簱
- }
-
- public static KingDeeUtilType get(Short id) {
- if (null == id) {
- return null;
- }
- for (KingDeeUtilType type : KingDeeUtilType.values()) {
- if (type.id.equals(id.intValue())) {
- return type;
- }
- }
- return null;
- }
-
- public static KingDeeUtilType get(String desc) {
- if (null == desc) {
- return null;
- }
- for (KingDeeUtilType type : KingDeeUtilType.values()) {
- if (type.desc.equals(desc)) {
- return type;
- }
- }
- return null;
- }
-
- public static KingDeeUtilType get(KingDeeUtilType type) {
- if (null == type) {
- return null;
- }
- for (KingDeeUtilType crnLiftPosType : KingDeeUtilType.values()) {
- if (crnLiftPosType == type) {
- return crnLiftPosType;
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java b/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
deleted file mode 100644
index 40b49c3..0000000
--- a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.erp.kingdee.utils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-public class KingDeeUtil {
-
- //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- public static Date KingDeeDate(String jsonArrayDate) throws ParseException {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
- DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
- LocalDateTime dateTime = LocalDateTime.parse(jsonArrayDate, formatter);
- String format = dateFormat.format(dateTime);
- return sdf.parse(format);
- }
-
-
-}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
deleted file mode 100644
index e21a059..0000000
--- a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.zy.erp.kingdee.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Map;
-
-@Slf4j
-public class PostMesDataUtils extends AbstractHandler<String> {
-
- public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam) {
-// if (true){
-// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
-// return SUCCESS;
-// }
- if (combParam != null) {
- String response = "";
- boolean success = false;
- try {
-// Map<String, Object> map = new HashMap<>()
-// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder()
-// .setHeaders(map)
- .setUri(URL)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- System.out.println("response:" + response);
- JSONObject jsonObject = JSON.parseObject(response);
-
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤" + name);
- }
- } catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save(
- "涓婃姤" + name,
- URL + "/" + mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- }
- return SUCCESS;
- }
-
- public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam, Map<String, Object> map) {
-// if (true){
-// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
-// return SUCCESS;
-// }
- if (combParam != null) {
- String response = "";
- boolean success = false;
- try {
-// Map<String, Object> map = new HashMap<>();
-// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(URL)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(combParam))
- .build()
- .doPost();
- System.out.println("response:" + response);
- JSONObject jsonObject = JSON.parseObject(response);
-
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤" + name);
- }
- } catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save(
- "涓婃姤" + name,
- URL + "/" + mesPath,
- null,
- "127.0.0.1",
- JSON.toJSONString(combParam),
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- }
- return SUCCESS;
- }
-}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8b4b238..9190846 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -39,7 +39,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: fyxcwms
+ subject: wms2.1
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -57,16 +57,6 @@
doubleLocsLeft: 1
# 鍙虫繁搴撲綅鎺掑彿
doubleLocsRight: 4
-# wms鍙傛暟閰嶇疆
-wms-parameter:
- # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
- automaticFillingBoardStaNosBoolean: false
- # 鑷姩琛ョ┖鏉跨珯鐐�
- automaticFillingBoardStaNos: 112,101
- # 鑷姩绉诲簱鍔熻兘寮�鍏�
- autoLocMoveBoolean: false
- # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
- autoLocMoveUnilateralBoolean: false
comb:
limit: 5000
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index b7157a6..ffd3de7 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -48,17 +48,10 @@
<select id="listByPage" resultMap="BaseResultMap">
SELECT
- isnull(mld.amount,0) as stock,
mm.*
FROM man_mat mm
LEFT JOIN man_tag mt ON mm.tag_id = mt.id
- LEFT JOIN (
- select
- matnr,
- sum(anfme) as amount
- from man_loc_detl
- group by matnr
- ) as mld on mld.matnr = mm.matnr
+
WHERE 1=1
and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
@@ -73,17 +66,10 @@
<select id="listByPage2" resultMap="BaseResultMap">
SELECT
- isnull(mld.amount,0) as stock,
mm.*
FROM man_mat mm
LEFT JOIN man_tag mt ON mm.tag_id = mt.id
- LEFT JOIN (
- select
- matnr,
- sum(anfme) as amount
- from man_loc_detl
- group by matnr
- ) as mld on mld.matnr = mm.matnr
+
WHERE 1=1
and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index b513892..238eaae 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -222,7 +222,7 @@
</update>
- <update id="increaseWorkQty2">
+ <update id="increaseWorkQtyById">
update man_order_detl
set work_qty = work_qty + #{workQty}
where 1=1
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 41a2537..a6bee40 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/fyxcwms";
+var baseUrl = "/wms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1