From 1d87fc5ed3d35dcaf3c5ebba51c98b0c3498ed48 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 一月 2024 16:25:18 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java | 83 +-------------------
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java | 89 ++++++++++++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 10 +-
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 7 +
5 files changed, 103 insertions(+), 88 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
index cc47e54..8de9b25 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
@@ -2,88 +2,15 @@
import lombok.Data;
+import java.util.List;
+
@Data
public class CreateMatParam {
- //涓�绾у垎绫�
- private String firstTag;
+ private List<MatParam> mats;
- //浜岀骇鍒嗙被
- private String secondTag;
+ private String sign;
- //鐗╂枡缂栧彿
- private String matnr;
-
- //鐗╂枡鍚嶇О
- private String maktx;
-
- //鐗╂枡鍒悕
- 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 weight;
-
- //闀垮害
- private Double length;
-
- //浣撶Н
- private Double volume;
-
- //涓夋柟缂栫爜
- private String threeCode;
-
- //渚涘簲鍟�
- private String supp;
-
- //渚涘簲鍟嗙紪鐮�
- private String suppCode;
-
- //淇濊川鏈�
- private String deadTime;
-
- //鐘舵��
- private Integer status;
-
- //澶囨敞
- private String memo;
+ private Long hostId;
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
new file mode 100644
index 0000000..0f2cb0f
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
@@ -0,0 +1,89 @@
+package com.zy.asrs.common.openapi.entity.param;
+
+import lombok.Data;
+
+@Data
+public class MatParam {
+
+ //涓�绾у垎绫�
+ private String firstTag;
+
+ //浜岀骇鍒嗙被
+ private String secondTag;
+
+ //鐗╂枡缂栧彿
+ private String matnr;
+
+ //鐗╂枡鍚嶇О
+ private String maktx;
+
+ //鐗╂枡鍒悕
+ 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 weight;
+
+ //闀垮害
+ private Double length;
+
+ //浣撶Н
+ private Double volume;
+
+ //涓夋柟缂栫爜
+ private String threeCode;
+
+ //渚涘簲鍟�
+ private String supp;
+
+ //渚涘簲鍟嗙紪鐮�
+ private String suppCode;
+
+ //淇濊川鏈�
+ private String deadTime;
+
+ //鐘舵��
+ private Integer status;
+
+ //澶囨敞
+ private String memo;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
index b72885d..137af10 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
@@ -28,6 +28,6 @@
List<OrderListDto> getOrderList(OrderListParam param, Long hostId);
- int createMat(List<CreateMatParam> mats, Long hostId);
+ int createMat(CreateMatParam param);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index fcd51c7..2e96f16 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.DetlDto;
import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
-import com.zy.asrs.common.openapi.entity.param.CreateMatParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakOutParam;
-import com.zy.asrs.common.openapi.entity.param.OrderListParam;
+import com.zy.asrs.common.openapi.entity.param.*;
import com.zy.asrs.common.openapi.service.ApiService;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
@@ -260,9 +257,10 @@
@Override
@Transactional
- public int createMat(List<CreateMatParam> mats, Long hostId) {
+ public int createMat(CreateMatParam param) {
int count = 0;
- for (CreateMatParam matParam : mats) {
+ Long hostId = param.getHostId();
+ for (MatParam matParam : param.getMats()) {
//鑾峰彇鍒嗙被
Tag tag = tagService.getTag(matParam.getFirstTag(), matParam.getSecondTag(), hostId);
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
index bef7058..1c98cb3 100644
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
@@ -124,9 +124,10 @@
*/
@PostMapping("/createMat")
public synchronized R createMat(@RequestHeader(required = true) String appkey,
- @RequestBody(required = false) List<CreateMatParam> mats) {
- HostKey hostKey = auth(appkey, mats, true);
- int result = apiService.createMat(mats, hostKey.getHostId());
+ @RequestBody(required = false) CreateMatParam param) {
+ HostKey hostKey = auth(appkey, param, true);
+ param.setHostId(hostKey.getHostId());
+ int result = apiService.createMat(param);
return R.ok().add(result);
}
--
Gitblit v1.9.1