From 9bc4b04f1b946e31c719ec051c3c481f5faac5e8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 一月 2024 16:01:11 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java | 89 ++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java | 3
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 97 -------------
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 104 ++++++++++++++
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 12 +
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java | 60 ++++++++
7 files changed, 273 insertions(+), 94 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
new file mode 100644
index 0000000..cc47e54
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
@@ -0,0 +1,89 @@
+package com.zy.asrs.common.openapi.entity.param;
+
+import lombok.Data;
+
+@Data
+public class CreateMatParam {
+
+ //涓�绾у垎绫�
+ 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 ef481bb..b72885d 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
@@ -1,6 +1,7 @@
package com.zy.asrs.common.openapi.service;
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;
@@ -27,4 +28,6 @@
List<OrderListDto> getOrderList(OrderListParam param, Long hostId);
+ int createMat(List<CreateMatParam> mats, Long hostId);
+
}
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 276473f..fcd51c7 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,6 +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;
@@ -15,6 +16,7 @@
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -35,6 +37,8 @@
private MatService matService;
@Autowired
private OrderSettleService orderSettleService;
+ @Autowired
+ private TagService tagService;
@Override
public void generateOrderPakIn(GenerateOrderPakInParam param) {
@@ -253,4 +257,104 @@
}
return listDtos;
}
+
+ @Override
+ @Transactional
+ public int createMat(List<CreateMatParam> mats, Long hostId) {
+ int count = 0;
+ for (CreateMatParam matParam : mats) {
+ //鑾峰彇鍒嗙被
+ Tag tag = tagService.getTag(matParam.getFirstTag(), matParam.getSecondTag(), hostId);
+
+ matService.remove(new LambdaQueryWrapper<Mat>()
+ .eq(Mat::getMatnr, matParam.getMatnr())
+ .eq(Mat::getHostId, hostId));
+ Mat mat = new Mat();
+ mat.setMatnr(matParam.getMatnr());//鐗╂枡鍙�
+ mat.setHostId(hostId);//浠撳簱ID
+ mat.setTagId(tag.getId());//鍒嗙被ID
+ if (!Cools.isEmpty(matParam.getMaktx())) {
+ mat.setMaktx(matParam.getMaktx());
+ }
+ if (!Cools.isEmpty(matParam.getMaktx())) {
+ mat.setMaktx(matParam.getMaktx());
+ }
+ if (!Cools.isEmpty(matParam.getName())) {
+ mat.setName(matParam.getName());
+ }
+ if (!Cools.isEmpty(matParam.getSpecs())) {
+ mat.setSpecs(matParam.getSpecs());
+ }
+ if (!Cools.isEmpty(matParam.getModel())) {
+ mat.setModel(matParam.getModel());
+ }
+ if (!Cools.isEmpty(matParam.getColor())) {
+ mat.setColor(matParam.getColor());
+ }
+ if (!Cools.isEmpty(matParam.getBrand())) {
+ mat.setBrand(matParam.getBrand());
+ }
+ if (!Cools.isEmpty(matParam.getUnit())) {
+ mat.setUnit(matParam.getUnit());
+ }
+ if (!Cools.isEmpty(matParam.getPrice())) {
+ mat.setPrice(matParam.getPrice());
+ }
+ if (!Cools.isEmpty(matParam.getSku())) {
+ mat.setSku(matParam.getSku());
+ }
+ if (!Cools.isEmpty(matParam.getUnits())) {
+ mat.setUnits(matParam.getUnits());
+ }
+ if (!Cools.isEmpty(matParam.getBarcode())) {
+ mat.setBarcode(matParam.getBarcode());
+ }
+ if (!Cools.isEmpty(matParam.getOrigin())) {
+ mat.setOrigin(matParam.getOrigin());
+ }
+ if (!Cools.isEmpty(matParam.getManu())) {
+ mat.setManu(matParam.getManu());
+ }
+ if (!Cools.isEmpty(matParam.getManuDate())) {
+ mat.setManuDate(matParam.getManuDate());
+ }
+ if (!Cools.isEmpty(matParam.getItemNum())) {
+ mat.setItemNum(matParam.getItemNum());
+ }
+ if (!Cools.isEmpty(matParam.getWeight())) {
+ mat.setWeight(matParam.getWeight());
+ }
+ if (!Cools.isEmpty(matParam.getLength())) {
+ mat.setLength(matParam.getLength());
+ }
+ if (!Cools.isEmpty(matParam.getVolume())) {
+ mat.setVolume(matParam.getVolume());
+ }
+ if (!Cools.isEmpty(matParam.getThreeCode())) {
+ mat.setThreeCode(matParam.getThreeCode());
+ }
+ if (!Cools.isEmpty(matParam.getSupp())) {
+ mat.setSupp(matParam.getSupp());
+ }
+ if (!Cools.isEmpty(matParam.getSuppCode())) {
+ mat.setSuppCode(matParam.getSuppCode());
+ }
+ if (!Cools.isEmpty(matParam.getDeadTime())) {
+ mat.setDeadTime(matParam.getDeadTime());
+ }
+ if (!Cools.isEmpty(matParam.getMemo())) {
+ mat.setMemo(matParam.getMemo());
+ }
+ if (!Cools.isEmpty(matParam.getStatus())) {
+ mat.setStatus(matParam.getStatus());
+ }else {
+ mat.setStatus(1);
+ }
+
+ if (matService.save(mat)) {
+ count++;
+ }
+ }
+ return count;
+ }
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index faca236..c794049 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -140,12 +140,6 @@
private String itemNum;
/**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
@@ -182,40 +176,10 @@
private String suppCode;
/**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
* 淇濊川鏈�
*/
@ApiModelProperty(value= "淇濊川鏈�")
private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -263,7 +227,7 @@
public Mat() {}
- public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -282,28 +246,23 @@
this.manu = manu;
this.manuDate = manuDate;
this.itemNum = itemNum;
- this.safeQty = safeQty;
this.weight = weight;
this.length = length;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
this.suppCode = suppCode;
- this.beBatch = beBatch;
this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
this.status = status;
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.hostId = hostId;
}
-// Mat manMat = new Mat(
+ // Mat manMat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
// null, // 鍟嗗搧缂栧彿[闈炵┖]
@@ -350,56 +309,6 @@
return String.valueOf(tag.getName());
}
return null;
- }
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
}
public String getStatus$(){
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
index 7743937..b888c2f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
@@ -7,4 +7,6 @@
Tag getTop(Long hostId);
+ Tag getTag(String firstTagName, String secondTagName, Long hostId);
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
index 25ac1a6..cd2364a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
@@ -5,8 +5,11 @@
import com.zy.asrs.common.wms.mapper.TagMapper;
import com.zy.asrs.common.wms.service.TagService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
@Service("manTagService")
public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
@@ -30,4 +33,61 @@
return top;
}
+ @Override
+ public Tag getTag(String firstTagName, String secondTagName, Long hostId) {
+ Date now = new Date();
+ Tag tag = this.getOne(new LambdaQueryWrapper<Tag>()
+ .eq(Tag::getName, "鍏ㄩ儴")
+ .eq(Tag::getHostId, hostId)
+ .isNull(Tag::getParentId));
+ if (tag == null) {
+ throw new CoolException("鍒嗙被绯荤粺寮傚父");
+ }
+
+ if (Cools.isEmpty(firstTagName)) {
+ //涓�绾у垎绫伙紝鐩存帴杩斿洖鏍瑰垎绫�(鍏ㄩ儴)
+ return tag;
+ }
+
+ if (!Cools.isEmpty(firstTagName)) {
+ //瀛樺湪涓�绾у垎绫伙紝鏌ヨ涓�绾у垎绫�
+ Tag firstTag = this.getOne(new LambdaQueryWrapper<Tag>()
+ .eq(Tag::getName, firstTagName)
+ .eq(Tag::getHostId, hostId));
+ if (firstTag == null) {
+ //涓�绾у垎绫讳负绌猴紝鍒涘缓涓�绾у垎绫�
+ firstTag = new Tag();
+ firstTag.setName(firstTagName);
+ firstTag.setParentId(tag.getId());
+ firstTag.setStatus(1);
+ firstTag.setHostId(hostId);
+ firstTag.setCreateTime(now);
+ firstTag.setUpdateTime(now);
+ this.save(firstTag);
+ }
+
+ if (!Cools.isEmpty(secondTagName)) {
+ //瀛樺湪浜岀骇鍒嗙被锛屾煡璇簩绾у垎绫�
+ Tag secondTag = this.getOne(new LambdaQueryWrapper<Tag>()
+ .eq(Tag::getName, secondTagName)
+ .eq(Tag::getHostId, hostId));
+ if (secondTag == null) {
+ //浜岀骇鍒嗙被涓虹┖锛屽垱寤轰簩绾у垎绫�
+ secondTag = new Tag();
+ secondTag.setName(secondTagName);
+ secondTag.setParentId(firstTag.getId());
+ secondTag.setStatus(1);
+ secondTag.setHostId(hostId);
+ secondTag.setCreateTime(now);
+ secondTag.setUpdateTime(now);
+ this.save(secondTag);
+ return secondTag;
+ }
+ return secondTag;
+ }else {
+ return firstTag;//涓嶅瓨鍦ㄤ簩绾у垎绫伙紝鐩存帴杩斿洖涓�绾у垎绫�
+ }
+ }
+ return tag;
+ }
}
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 acc70d5..bef7058 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.openapi.entity.HostKey;
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;
@@ -118,6 +119,17 @@
return R.ok().add(orderList);
}
+ /**
+ * 鍒涘缓鐗╂枡淇℃伅
+ */
+ @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());
+ return R.ok().add(result);
+ }
+
private HostKey auth(String appkey, Object obj, boolean signCheck) {
request.setAttribute("cache", obj);
if (Cools.isEmpty(appkey)) {
--
Gitblit v1.9.1