From 56de968727bd6e871c6823dce837f8d42f30e6f8 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 10 六月 2025 09:28:21 +0800
Subject: [PATCH] #
---
license.lic | 9 +--
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 8 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++-
src/main/resources/license.lic | 0
src/main/java/com/zy/asrs/controller/OpenMesController.java | 52 +++++++---------
5 files changed, 138 insertions(+), 41 deletions(-)
diff --git a/license.lic b/license.lic
index 9b49f06..e80870e 100644
--- a/license.lic
+++ b/license.lic
@@ -1,6 +1,3 @@
-�!�;蓧噐-C�>�?�<褚鳗梲嗝)� ��
]�
-芥馟� 睡PeUgY鬅\�
觡 i5赨,6籉鼶饜7^�-j翃V姮美V)乫�+钒闱萤WoS鋍i*4�臛2��爴�3:}萄娓傽濛姝
-霯v YO-Sz姧q遖U庲G埠U�2FE汾#緇�=巗�黬奌�
莂3sdL`e慔签痺�ь躈�(s g�$ 峾迊g賨�2�"\/貇7^C沘传崣湼葬�) �
-�*
-22R�6厵5O樎h目僅巉喰屝吱 禓~:�=沁| 感�
傏甇P]&蒨B;雈*"5嬣� 醴附罈$f湔� Bb倽Na|\�仇=杕杬谒峵蠟}NZ\岼�紀膆兌鄟Rl繽簯!][愌3Kq]E蓰�=鎗iI($�&陮滖鏡��Q.囏�升姫廄�*<楗è.扤�+鑔麢.尗 吮\+5m~衱 �鴛5鷸zl0蕌損
-1X@o}l斧�:嫁m篽iOw�5﹪鯆ㄕxG rWe(� 倯な 騁b�>鍖狓瓇�+擿諳4(輙k槬cX3Fv陥I薆玦<憧3�1fO"o_O藆,褝-矓鷫獮旵B2菭bp2W乲 惽�0� 膫/苛%瀨鑜狨擵跠蛔� 焍r犉獫%y ': �'Nn訛�t�:&7-
\ No newline at end of file
+�!�;蓧嚔腔踜酰g嚒+絅揘QM�7\頰Pe珇j`Y铅_�"K椯ュ柵煲陨慺I淠袹敹<t譽岻�7琥蟣`瞕t╖�7鐚夃_皳粭菁h戲蚷怲AN�Ay撚�櫍�-a�4�:苵)杻#7{e93脖S鬨!甂
乃i爂r� M�#K釐感� �&��H层�& 阬訦Pp 蹥醒崇v帣,躛�膕:鯻�;儽�kK毿(絭贍�3f宎PF�
＇O鸜暵�)瑳尕3�$v拵�r泜��%� K�%9迎洐 镂[ �>)�=8b@�9盿c筹2胖$挨箟C銼鈊 鱡繃%沩Nm烽玑sb┆橁弼譨餋O虖2I^jKW� b戸R��坙O辋遹�'O佀� �'� U馒5'& 圙Q�瘮基6�鎜奮Sr;Y�){_�#xG醁*聭.�!d� =X瞌J� 琊?sq崡绰� ＋'扨瑟顥畓 93凐殀0- �鬧曩離u0蚨柷
迿d7)PB&骩k婓]隄XGr�5誽s篙
+蝈溎∠h6��-Q@O璳ih�'fz隸"? �#壣籬麆<臚3蔶轛o� AＡ@ν:�.yLZ酲,9un�#V0f|D籹T�=�崜9悀
+~F�� 7琩嵭|燦+6x�$v樫�<瀹"�M^�;鼟fw淴d)0忏�逮蜕&L丐\�g!『Reモ� $獱 闓�墐%�;繌}裯羕赖+靟}�-9�`�)!8�虳設Q渟跽騿 26?獎A
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/controller/OpenMesController.java b/src/main/java/com/zy/asrs/controller/OpenMesController.java
index 15d8a29..03c083c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenMesController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenMesController.java
@@ -27,7 +27,7 @@
*/
@Slf4j
@RestController
-@RequestMapping("open/wms")
+@RequestMapping("Open/wms")
public class OpenMesController extends BaseController {
private static final boolean auth = true;
@@ -87,18 +87,18 @@
return R.ok();
}
- @PostMapping("/orderSync/default/v1")
- @AppAuth(memo = "璁㈠崟淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) GTOrderParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
-
- return R.ok();
- }
+// @PostMapping("/orderSync/default/v1")
+// @AppAuth(memo = "璁㈠崟淇℃伅鍚屾鎺ュ彛")
+// public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) GTOrderParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+//
+// return R.ok();
+// }
/**
@@ -130,7 +130,7 @@
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/default/v1")
+ @PostMapping("/order/pakout/auth/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
@@ -138,12 +138,6 @@
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getLgort())) {
- return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
- }
- if (!param.getLgort().equals("5006")) {
- return R.ok();
}
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
@@ -210,15 +204,15 @@
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 (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- if (!APP_KEY_LIST.contains(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
+// if (!auth) {
+// return;
+// }
+// if (Cools.isEmpty(appkey)) {
+// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+// }
+// if (!APP_KEY_LIST.contains(appkey)) {
+// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+// }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 0c53347..d8c1843 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -33,7 +33,7 @@
/**
* 鍟嗗搧鍒嗙被
*/
- private String groupCode;
+ private String tagId;
/**
* 鍒嗙被鍚嶇О
@@ -196,4 +196,10 @@
private String memo;
}
+ public MatSyncParam() {
+ }
+
+ public MatSyncParam(List<MatParam> matDetails) {
+ this.matDetails = matDetails;
+ }
}
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 22ac4dc..9b7804d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -478,6 +478,10 @@
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
+
+
+
+
for(MatSyncParam.MatParam matParam : param.getMatDetails()){
if(Cools.isEmpty(matParam.getMatnr())){
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
@@ -488,19 +492,81 @@
// 鍒嗙被
Long tagId;
// 涓�绾у垎绫�
- Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getGroupCode()));
- if (tag == null) {
- throw new CoolException("鍑洪敊锛屾湭鎵惧埌鍒嗙被");
+ if (!Cools.isEmpty(matParam.getTagId()) && !Cools.isEmpty(matParam.getGroupName())) {
+ Tag priTag = tagService.selectByName(matParam.getTagId(), 1);
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ matParam.getTagId(), // 鍚嶇О
+ top.getId(), // 鐖剁骇
+ top.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(priTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectByName(matParam.getGroupName(), 2);
+ if (secTag == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ secTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ tagId = secTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
}
if (mat == null) {
mat = new Mat();
+
mat.sync(matParam);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
// mat.setModel(param.getModel());
- mat.setTagId(tag.getId());
+ mat.setTagId(tagId);
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
@@ -511,11 +577,45 @@
}
} else {
mat.sync(matParam);
- mat.setTagId(tag.getId());
+ mat.setTagId(tagId);
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()));
+// if (tag == null) {
+// throw new CoolException("鍑洪敊锛屾湭鎵惧埌鍒嗙被");
+// }
+// if (mat == null) {
+// mat = new Mat();
+// mat.sync(matParam);
+//// mat.setMatnr(param.getMatnr());
+//// mat.setMaktx(param.getMaktx());
+//// mat.setSpecs(param.getSpecs());
+//// mat.setModel(param.getModel());
+//
+// mat.setTagId(tag.getId());
+// mat.setStatus(1);
+// mat.setCreateTime(now);
+// mat.setUpdateTime(now);
+// if (!matService.insert(mat)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// } else {
+// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+// }
+// } else {
+// mat.sync(matParam);
+// mat.setTagId(tag.getId());
+// if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+// throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
+// }
+// }
}
}
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 4940185..e80870e 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1