From 1e9434892fd87b5a99176fdfecc2cb63ddb5ab25 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 27 六月 2025 08:49:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/third/TokenUtils.java | 10 ++-
src/main/webapp/static/js/order/order.js | 8 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++-
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 19 +++---
src/main/java/com/zy/asrs/controller/MatController.java | 2
src/main/webapp/static/js/common.js | 8 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 67 ++++++++++++----------
src/main/resources/application.yml | 6 +-
src/main/java/com/zy/asrs/controller/OpenMesController.java | 6 +-
10 files changed, 77 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 257417f..b46a4fa 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -55,7 +55,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Value("mes.url")
+ @Value("${mes.url}")
private String url;
@RequestMapping(value = "/mat/auto/matnr/auth")
diff --git a/src/main/java/com/zy/asrs/controller/OpenMesController.java b/src/main/java/com/zy/asrs/controller/OpenMesController.java
index 03c083c..f875669 100644
--- a/src/main/java/com/zy/asrs/controller/OpenMesController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenMesController.java
@@ -204,9 +204,9 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
-// if (!auth) {
-// return;
-// }
+ if (!auth) {
+ return;
+ }
// if (Cools.isEmpty(appkey)) {
// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
// }
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 e9f38e3..adf887f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -89,10 +89,10 @@
@Resource
private BasDevpMapper basDevpMapper;
- @Value("mes.url")
+ @Value("${mes.url}")
private String url;
- @Value("mes.pakin")
+ @Value("${mes.code}")
private String code;
@Override
@@ -388,7 +388,7 @@
}
elem.setTemp1(codeDataParam.getQuality());
elem.setAnfme(codeDataParam.getQty());
- elem.setBatch(codeDataParam.getBatchNum());
+ //elem.setBatch(codeDataParam.getBatchNum());
elem.setThreeCode(codeDataParam.getBarcode());
elem.setMatnr(codeDataParam.getProductionCode());
elem.setMaktx(codeDataParam.getProductionName());
@@ -475,9 +475,13 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
+ log.info("getData:{}",response);
MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
if (jsonObject.getCode().equals(200)) {
- return JSON.parseArray(jsonObject.getData(), CodeDataParam.class);
+ JSONObject jsonObject1 = JSON.parseObject(jsonObject.getData());
+ if (jsonObject1.getString("barcodeList")!=null){
+ return JSON.parseArray(jsonObject1.getString("barcodeList"), CodeDataParam.class);
+ }
}
throw new CoolException(jsonObject.getMessage());
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9b7804d..deb4716 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
@@ -13,6 +14,7 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,11 +57,22 @@
@Autowired
private WrkDetlLogServiceImpl wrkDetlLogService;
+ @Autowired
+ private ApiLogService apiLogService;
+
+ public void callApiLogSaveOrder(Object order, String name, Boolean bool) {
+ apiLogService.save(name, "null", null, null,
+ JSON.toJSONString(order),
+ null, bool);
+ }
+
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
+ callApiLogSaveOrder(param, "鍏ュ簱鍗�", true);
+
Order order = orderService.selectByNo(param.getOrderNo());
- if (!Cools.isEmpty(order) && order.getSettle() !=1) {
+ if (!Cools.isEmpty(order) && order.getSettle() != 1) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸叉湁宸ヤ綔浠诲姟");
}
if (!Cools.isEmpty(order)) {
@@ -114,8 +127,8 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
- , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getFromOrderNo()
+ , detail.getMark(), detail.getCustomer(), detail.getSuppName(), detail.getTemp1(), detail.getTemp2(), detail.getTemp3(), detail.getTemp4());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -160,6 +173,7 @@
@Override
@Transactional
public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
+ callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
@@ -206,6 +220,7 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
+ callApiLogSaveOrder(param, "鍑哄簱鍗�", true);
Order order = orderService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
@@ -261,8 +276,8 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
- , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getFromOrderNo()
+ , detail.getMark(), detail.getCustomer(), detail.getSuppName(), detail.getTemp1(), detail.getTemp2(), detail.getTemp3(), detail.getTemp4());
dto.setTemp1(param.getQuality());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
@@ -474,16 +489,13 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
-
-
-
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -578,14 +590,10 @@
} else {
mat.sync(matParam);
mat.setTagId(tagId);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
-
-
-
-
//Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getTagId()));
@@ -625,8 +633,8 @@
public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
EntityWrapper<WrkMastLog> wrkMastLogEntityWrapper = new EntityWrapper<>();
- wrkMastLogEntityWrapper.ge("modi_time",param.getStartTime());
- wrkMastLogEntityWrapper.le("modi_time",param.getEndTime());
+ wrkMastLogEntityWrapper.ge("modi_time", param.getStartTime());
+ wrkMastLogEntityWrapper.le("modi_time", param.getEndTime());
// wrkMastLogEntityWrapper.isNotNull("sheet_no");
wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
@@ -635,7 +643,7 @@
wrkDetlLogs.forEach(wrkDetlLog -> {
if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
- if (!Cools.isEmpty(wrkDetlLog.getOrderNo())){
+ if (!Cools.isEmpty(wrkDetlLog.getOrderNo())) {
Order order = orderService.selectByNo(wrkDetlLog.getOrderNo());
if (!Cools.isEmpty(order)) {
locDetlByTimeDTO.setDate(order.getOrderTime());
@@ -643,7 +651,7 @@
locDetlByTimeDTO.setOrderType(order.getDocType$());
}
locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
- locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
+ locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() < 100 ? wrkMastLog.getLocNo() : wrkMastLog.getSourceLocNo());
locDetlByTimeDTO.setBatch(wrkDetlLog.getBatch());
locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme());
locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo());
@@ -693,11 +701,11 @@
@Transactional
public void syncTag(List<TagParam> param) {
- param.forEach(tag-> {
+ param.forEach(tag -> {
// 鍒嗙被
Long tagId;
Date now = new Date();
- if (Cools.isEmpty(tag.getParentItemClassId())){
+ if (Cools.isEmpty(tag.getParentItemClassId())) {
Tag priTag = tagService.selectByName("鍏ㄩ儴", 1);
// 浜岀骇鍒嗙被
@@ -730,8 +738,8 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
- }else {
- Tag priTag =tagService.selectOne(new EntityWrapper<Tag>().eq("memo", tag.getParentItemClassId()));
+ } else {
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", tag.getParentItemClassId()));
if (priTag == null) {
Tag top = tagService.getTop();
NodeUtils nodeUtils = new NodeUtils();
@@ -791,7 +799,7 @@
if (tagMapper.insert(secTag) == 0) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
- }else {
+ } else {
secTag.setName(tag.getName());
secTag.setParentId(priTag.getId());
secTag.setParentName(priTag.getName());
@@ -804,15 +812,13 @@
List<Tag> tags = tagService.selectList(new EntityWrapper<Tag>().eq("parent_id", secTag.getId()));
if (!Cools.isEmpty(tags)) {
for (Tag tag1 : tags) {
- tag1.setPath(nodeUtils.path.toString()+","+secTag.getId());
- tag1.setPathName(nodeUtils.pathName.toString()+","+secTag.getName());
+ tag1.setPath(nodeUtils.path.toString() + "," + secTag.getId());
+ tag1.setPathName(nodeUtils.pathName.toString() + "," + secTag.getName());
if (tagMapper.updateById(tag1) == 0) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
}
}
-
-
}
@@ -821,6 +827,7 @@
}
});
}
+
@Transactional
@Override
public void orderDelete(String orderNo) {
@@ -828,7 +835,7 @@
if (order == null) {
throw new CoolException("鏈煡璇㈠埌瀵瑰簲璁㈠崟淇℃伅");
}
- if (order.getSettle() != 1){
+ if (order.getSettle() != 1) {
throw new CoolException("璇ヨ鍗曞凡鏈夊搴斾换鍔★紝绂佹鍒犻櫎");
}
List<OrderDetl> OrderDetl = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..1619b74 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -38,7 +38,7 @@
}
}
-// @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
String erpReport = Parameter.get().getErpReport();
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 ade0620..9046a26 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -7,11 +7,9 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlReport;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlReportService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.third.TokenUtils;
@@ -39,16 +37,18 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private OrderDetlReportService orderDetlReportService;
@Autowired
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
- @Value("mes.url")
+ @Value("${mes.url}")
private String url;
- @Value("mes.pakin")
+ @Value("${mes.pakin}")
private String pakin;
@Transactional
@@ -57,9 +57,10 @@
if (null == docType) {
return SUCCESS;
}
- List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
+ //List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
// 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
+ if (docType.getPakin() == 1 && !Cools.isEmpty(orderDetls)) {
MesPakinParam pakinParam = new MesPakinParam();
pakinParam.setReceiptNumber(order.getOrderNo());
pakinParam.setReceiptType(order.getDocType$());
@@ -106,7 +107,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- url +pakin,
+ url + pakin,
null,
"127.0.0.1",
JSON.toJSONString(pakinParam),
diff --git a/src/main/java/com/zy/asrs/third/TokenUtils.java b/src/main/java/com/zy/asrs/third/TokenUtils.java
index f88cfe3..b9d636e 100644
--- a/src/main/java/com/zy/asrs/third/TokenUtils.java
+++ b/src/main/java/com/zy/asrs/third/TokenUtils.java
@@ -2,19 +2,20 @@
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 clientId = "xincai";
private static String clientSecret = "123456";
- private static String erpId = "1130021";
+ private static String erpId = "1933048022695026688";
- private static String tokenUrl = "/getMsg/v2/createToken";
+ private static String tokenUrl = "/mes-data/getMsg/v2/createToken";
public static Map<String, Object> getToken(String ip) {
Map<String, Object> data = new HashMap<>();
@@ -33,11 +34,12 @@
} 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 null;
+ return data;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ad4b454..63b3a1e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -115,6 +115,6 @@
crn4: false
mes:
- url: http://192.168.10.201:8080/mes/
- pakin: /getMsg/v2/sync/WMSDeliveryNoteJudgeFinish
- code: /getMsg/v2/sync/barcodeStatusQuery
\ No newline at end of file
+ url: 192.168.12.120:8080
+ pakin: /mes-data/getMsg/v2/sync/WMSDeliveryNoteJudgeFinish
+ code: /mes-data/getMsg/v2/sync/barcodeStatusQuery
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index df11990..aa8f56b 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -224,15 +224,15 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
- ,{field: 'sku', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
- ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'sku', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: true}
]
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 88d77d7..f85e12f 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -128,13 +128,13 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'specs', title: '瑙勬牸', width: 160},
{field: 'batch', title: '鎵瑰彿'},
- {field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
- ,{field: 'sku', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
- ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false},
+ // {field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
+ // ,{field: 'sku', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
+ // ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- {align: 'center', title: '鎵撳嵃', toolbar: '#printOperate', width: 80}
+ // {align: 'center', title: '鎵撳嵃', toolbar: '#printOperate', width: 80}
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
--
Gitblit v1.9.1