From 4072a7775f72a186b0f4b6e48cdef40b3c2d7f5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 09:43:14 +0800
Subject: [PATCH] #
---
version/doc/商品档案Excel导入模板.xlsx | 0
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 18 ++++----
src/main/java/com/zy/asrs/utils/MatUtils.java | 30 +++++++++++++++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 18 ++++----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 28 ++++++++-----
5 files changed, 65 insertions(+), 29 deletions(-)
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 b546e16..6e8e66e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -316,15 +316,15 @@
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鎵撳寘涓嬬嚎甯墭涓婃姤",
-// MesConstant.URL + MesConstant.PACK_DOWN_URL,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(mesCombParam),
-// response,
-// success
-// );
+ apiLogService.save(
+ "鎵撳寘涓嬬嚎甯墭涓婃姤",
+ MesConstant.URL + MesConstant.PACK_DOWN_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(mesCombParam),
+ response,
+ success
+ );
} catch (Exception e) { log.error("", e); }
}
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 7dd8ac8..ece8889 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -320,7 +321,6 @@
throw new CoolException(barcode + "閲嶅鎻愪氦");
}
Date now = new Date();
- // todo:luxiaotao 瑙ｆ瀽鏉＄爜瑙勫垯锛岃幏鍙栫墿鏂欎唬鐮�
pack = new Pack(
barcode, // 鏉＄爜[闈炵┖]
null, // 鍟嗗搧缂栧彿
@@ -336,16 +336,22 @@
if (!packService.insert(pack)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
- Mat mat = new Mat();
- mat.setTagId(tagService.getTop().getId());
- mat.setMatnr(barcode);
- mat.setMaktx(barcode);
- mat.setStatus(1);
- mat.setCreateTime(now);
- mat.setUpdateTime(now);
- mat.setMemo("鎵撳寘涓婄嚎");
- if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+
+ Mat analyse = MatUtils.analyseMat(barcode);
+ Mat mat = matService.selectByMatnr(analyse.getMatnr());
+ if (mat == null) {
+ mat = new Mat();
+ // todo
+ mat.setTagId(tagService.getTop().getId());
+ mat.setMatnr(analyse.getMatnr());
+ mat.setMaktx(barcode);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ mat.setMemo("鎵撳寘涓婄嚎");
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
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 ea00821..2acade9 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -77,15 +77,15 @@
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鎴愬搧搴撳叆搴撲笂鎶�",
-// MesConstant.URL + MesConstant.PAKIN_URL,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(pakinParam),
-// response,
-// success
-// );
+ apiLogService.save(
+ "鎴愬搧搴撳叆搴撲笂鎶�",
+ MesConstant.URL + MesConstant.PAKIN_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(pakinParam),
+ response,
+ success
+ );
} catch (Exception e) { log.error("", e); }
}
return SUCCESS;
diff --git a/src/main/java/com/zy/asrs/utils/MatUtils.java b/src/main/java/com/zy/asrs/utils/MatUtils.java
new file mode 100644
index 0000000..8789be4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/MatUtils.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.utils;
+
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Mat;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Created by vincent on 2022/4/23
+ */
+@Slf4j
+public class MatUtils {
+
+ //
+ public static Mat analyseMat(String uuid) {
+ try {
+ String[] split = uuid.split("-");
+ String matnr = split[0] + "-" + split[1];
+ String serial = split[2];
+ Mat mat = new Mat();
+ mat.setMatnr(matnr);
+ mat.setBarcode(serial);
+ mat.setModel(split[0]);
+ return mat;
+ } catch (Exception e) {
+ log.error("", e);
+ throw new CoolException(uuid + "鏉＄爜鎵撳寘涓婄嚎閿欒");
+ }
+ }
+
+}
diff --git "a/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 0cfdac9..87db32a 100644
--- "a/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/version/doc/\345\225\206\345\223\201\346\241\243\346\241\210Excel\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.1