From a2887a248fdf3d67175529e9e687d8feef965466 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 11 五月 2025 10:00:57 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/asrs/controller/OpenController.java | 21 ++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 4
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 199 +++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 118 ++++++++++++++++++-
src/main/java/com/zy/asrs/service/OpenService.java | 8
5 files changed, 332 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c0c3585..a155bcf 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,10 +5,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
@@ -140,7 +137,23 @@
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects.add(param);
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
new file mode 100644
index 0000000..298a252
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -0,0 +1,199 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍟嗗搧鍚屾鎺ュ彛锛屽弬鏁�
+ * Created on 2022/6/22
+ */
+@Data
+public class MatSyncParam {
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ public String createTime;
+
+ public List<MatParam> matDetails;
+
+ @Data
+ public static class MatParam{
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ private String maktx;
+
+ /**
+ * 鍟嗗搧鍒嗙被
+ */
+ private String groupCode;
+
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ private String groupName;
+
+ /**
+ * 鍒悕
+ */
+ private String name;
+
+ /**
+ * 瑙勬牸
+ */
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ private Double price;
+
+ /**
+ * sku
+ */
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ private Integer deadWarn;
+
+ /**
+ * 鏉ユ簮 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ private String createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 澶囨敞
+ */
+ private String memo;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 55aa8a6..0cc0b40 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,10 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -43,4 +40,7 @@
void packageUp(PackParam param);
void pickToFill(WrkMast wrkMast);
+
+
+ void syncMat(MatSyncParam param);
}
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 e1c7b1b..a57160c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -7,10 +7,7 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
@@ -18,6 +15,7 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -280,14 +278,15 @@
}
}
}
+
@Override
@Transactional
- public void pickToFill( WrkMast wrkMast ){
+ public void pickToFill(WrkMast wrkMast) {
Date now = new Date();
wrkMast.setIoType(101);
wrkMast.setMemo("鎹℃枡杞叏鏉垮伐浣滄。");
- wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
- .eq("wrk_no",wrkMast.getWrkNo()));
+ wrkMastService.update(wrkMast, new EntityWrapper<WrkMast>()
+ .eq("wrk_no", wrkMast.getWrkNo()));
wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
for (LocDetl locDetl : locDetls) {
@@ -304,7 +303,7 @@
wrkDetl.setMatType(locDetl.getMatType());
wrkDetlService.insert(wrkDetl);
}
- locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
+ locMastService.updateLocSts(wrkMast.getSourceLocNo(), "R");
}
@@ -474,4 +473,107 @@
}
}
+ @Override
+ @Transactional
+ public void syncMat(MatSyncParam param) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
+ throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+ }
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
+ throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+ }
+ Date now = new Date();
+ Mat mat = matService.selectByMatnr(matParam.getMatnr());
+ if (mat == null) {
+ mat = new Mat();
+ // 鍒嗙被
+ Long tagId;
+ // 涓�绾у垎绫�
+ if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupCode(), // 鍚嶇О
+ 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(), 3);
+ 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, // 鏁伴噺
+ 3, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ tagId = secTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
+ }
+ Synchro.Copy(matParam,mat);
+
+
+ mat.setTagId(tagId);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ }
+ } else {
+ Synchro.Copy(matParam,mat);
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
+ 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 43b50b1..3a333e7 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -89,7 +89,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
+ "鍏ュ簱涓婃姤",
MesConstant.URL + MesConstant.PAKIN_URL,
null,
"127.0.0.1",
@@ -143,7 +143,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳嚭搴撲笂鎶�",
+ "鍑哄簱涓婃姤",
MesConstant.URL + MesConstant.PAKOUT_URL,
null,
"127.0.0.1",
--
Gitblit v1.9.1