From 7dde8f04b2dbd8e083b594c55ddbfbc9f8dd353c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 24 五月 2024 15:09:45 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java | 177 ++++++++++++-----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 69 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 136 +++++++-----
zy-asrs-openapi/src/main/resources/application.yml | 4
zy-asrs-openapi/src/main/webapp/views/md/createMat.md | 45 ++-
zy-asrs-openapi/src/main/webapp/views/md/createMat_old.md | 142 ++++++++++++++
6 files changed, 436 insertions(+), 137 deletions(-)
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
index 0f2cb0f..4e458ea 100644
--- 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
@@ -17,68 +17,53 @@
//鐗╂枡鍚嶇О
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 String color;
+//
+// //鍝佺墝
+// private String brand;
+//
+// //鍗曚綅
+// private String unit;
+//
+// //鍗曚环
+// private Double price;
+//
+// //sku
+// private String sku;
+//
+// //浜у湴
+// private String origin;
+//
+// //鍘傚
+// private String manu;
+//
+// //鐢熶骇鏃ユ湡
+// private String manuDate;
+//
+// //鍝侀」鏁�
+// private String itemNum;
+//
+// //浣撶Н
+// private Double volume;
+//
+// //涓夋柟缂栫爜
+// private String threeCode;
+//
+// //渚涘簲鍟�
+// private String supp;
+//
+// //渚涘簲鍟嗙紪鐮�
+// private String suppCode;
+//
+// //淇濊川鏈�
+// private String deadTime;
//鐘舵��
private Integer status;
@@ -86,4 +71,82 @@
//澶囨敞
private String memo;
+ //涓昏浠撳簱
+ private String mainHost;
+
+ //涓昏鏉ユ簮
+ private String mainSource;
+
+ //鏉＄爜
+ private String barcode;
+
+ //寰幆鐩樼偣鐮�
+ private String cyclePickCode;
+
+ //瀛樻斁浣嶇疆
+ private String locationStock;
+
+ //鏉愯川
+ private String material;
+
+ //鏈哄瀷
+ private String model;
+
+ //鍒朵护
+ private String decrees;
+
+ //閲嶉噺
+ private Double weight;
+
+ //鍥惧彿
+ private String imgNum;
+
+ //閲囪喘鍗曚綅
+ private String purchasingUnits;
+
+ //宸ヨ壓缂栧彿
+ private String processNumber;
+
+ //鎸囧畾bom
+ private String bom;
+
+ //瀹夊叏瀛橀噺
+ private String safeNum;
+
+ //鏈�浣庤ˉ閲�
+ private String miniCount;
+
+ //琛ヨ揣鍊嶉噺
+ private String replenishmentNum;
+
+ //鑷畾涔�1
+ private String tmp1;
+
+ //鑷畾涔�2
+ private String tmp2;
+
+ //鑷畾涔�3
+ private String tmp3;
+
+ //鎸夐渶姹傝ˉ璐�
+ private String restockDemand;
+
+ //澶辨晥
+ private String lapse;
+
+ //蹇嵎鐮�
+ private String shortcuts;
+
+ //璁￠噺鍗曚綅
+ private String units;
+
+ //闀垮害
+ private String length;
+
+ //瀹藉害
+ private String width;
+
+ //楂樺害
+ private String height;
+
}
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 a481329..61f40b5 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
@@ -259,63 +259,6 @@
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());
}
@@ -325,6 +268,85 @@
mat.setStatus(1);
}
+ if (!Cools.isEmpty(matParam.getMainHost())) {
+ mat.setMainHost(matParam.getMainHost());
+ }
+ if (!Cools.isEmpty(matParam.getMainSource())) {
+ mat.setMainSource(matParam.getMainSource());
+ }
+ if (!Cools.isEmpty(matParam.getBarcode())) {
+ mat.setBarcode(matParam.getBarcode());
+ }
+ if (!Cools.isEmpty(matParam.getCyclePickCode())) {
+ mat.setCyclePickCode(matParam.getCyclePickCode());
+ }
+ if (!Cools.isEmpty(matParam.getLocationStock())) {
+ mat.setLocationStock(matParam.getLocationStock());
+ }
+ if (!Cools.isEmpty(matParam.getMaterial())) {
+ mat.setMaterial(matParam.getMaterial());
+ }
+ if (!Cools.isEmpty(matParam.getModel())) {
+ mat.setModel(matParam.getModel());
+ }
+ if (!Cools.isEmpty(matParam.getDecrees())) {
+ mat.setDecrees(matParam.getDecrees());
+ }
+ if (!Cools.isEmpty(matParam.getWeight())) {
+ mat.setWeight(matParam.getWeight());
+ }
+ if (!Cools.isEmpty(matParam.getImgNum())) {
+ mat.setImgNum(matParam.getImgNum());
+ }
+ if (!Cools.isEmpty(matParam.getPurchasingUnits())) {
+ mat.setPurchasingUnits(matParam.getPurchasingUnits());
+ }
+ if (!Cools.isEmpty(matParam.getProcessNumber())) {
+ mat.setProcessNumber(matParam.getProcessNumber());
+ }
+ if (!Cools.isEmpty(matParam.getBom())) {
+ mat.setBom(matParam.getBom());
+ }
+ if (!Cools.isEmpty(matParam.getSafeNum())) {
+ mat.setSafeNum(matParam.getSafeNum());
+ }
+ if (!Cools.isEmpty(matParam.getMiniCount())) {
+ mat.setMiniCount(matParam.getMiniCount());
+ }
+ if (!Cools.isEmpty(matParam.getReplenishmentNum())) {
+ mat.setReplenishmentNum(matParam.getReplenishmentNum());
+ }
+ if (!Cools.isEmpty(matParam.getTmp1())) {
+ mat.setTmp1(matParam.getTmp1());
+ }
+ if (!Cools.isEmpty(matParam.getTmp2())) {
+ mat.setTmp2(matParam.getTmp2());
+ }
+ if (!Cools.isEmpty(matParam.getTmp3())) {
+ mat.setTmp3(matParam.getTmp3());
+ }
+ if (!Cools.isEmpty(matParam.getRestockDemand())) {
+ mat.setRestockDemand(matParam.getRestockDemand());
+ }
+ if (!Cools.isEmpty(matParam.getLapse())) {
+ mat.setLapse(matParam.getLapse());
+ }
+ if (!Cools.isEmpty(matParam.getShortcuts())) {
+ mat.setShortcuts(matParam.getShortcuts());
+ }
+ if (!Cools.isEmpty(matParam.getUnits())) {
+ mat.setUnits(matParam.getUnits());
+ }
+ if (!Cools.isEmpty(matParam.getLength())) {
+ mat.setLength(Double.parseDouble(matParam.getLength()));
+ }
+ if (!Cools.isEmpty(matParam.getWidth())) {
+ mat.setWidth(matParam.getWidth());
+ }
+ if (!Cools.isEmpty(matParam.getHeight())) {
+ mat.setHeight(matParam.getHeight());
+ }
+
if (matService.save(mat)) {
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 c794049..aca41fe 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
@@ -107,7 +107,7 @@
* 鍗曚綅閲�
*/
@ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ private String units;
/**
* 鏉＄爜
@@ -225,9 +225,74 @@
@ApiModelProperty(value= "浠撳簱ID")
private Long hostId;
+ //蹇靛垵浣跨敤浠ヤ笅棰濆瀛楁
+ //涓昏浠撳簱
+ private String mainHost;
+
+ //涓昏鏉ユ簮
+ private String mainSource;
+
+ //寰幆鐩樼偣鐮�
+ private String cyclePickCode;
+
+ //瀛樻斁浣嶇疆
+ private String locationStock;
+
+ //鏉愯川
+ private String material;
+
+ //鍒朵护
+ private String decrees;
+
+ //鍥惧彿
+ private String imgNum;
+
+ //閲囪喘鍗曚綅
+ private String purchasingUnits;
+
+ //宸ヨ壓缂栧彿
+ private String processNumber;
+
+ //鎸囧畾bom
+ private String bom;
+
+ //瀹夊叏瀛橀噺
+ private String safeNum;
+
+ //鏈�浣庤ˉ閲�
+ private String miniCount;
+
+ //琛ヨ揣鍊嶉噺
+ private String replenishmentNum;
+
+ //鑷畾涔�1
+ private String tmp1;
+
+ //鑷畾涔�2
+ private String tmp2;
+
+ //鑷畾涔�3
+ private String tmp3;
+
+ //鎸夐渶姹傝ˉ璐�
+ private String restockDemand;
+
+ //澶辨晥
+ private String lapse;
+
+ //蹇嵎鐮�
+ private String shortcuts;
+
+ //瀹藉害
+ private String width;
+
+ //楂樺害
+ private String height;
+
+
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 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) {
+ 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, String 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;
diff --git a/zy-asrs-openapi/src/main/resources/application.yml b/zy-asrs-openapi/src/main/resources/application.yml
index 1e16863..d8d79c1 100644
--- a/zy-asrs-openapi/src/main/resources/application.yml
+++ b/zy-asrs-openapi/src/main/resources/application.yml
@@ -13,9 +13,9 @@
# url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
# username: sa
# password: sa@123
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ncasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
servlet:
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/createMat.md b/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
index c50a327..c0a9629 100644
--- a/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
+++ b/zy-asrs-openapi/src/main/webapp/views/md/createMat.md
@@ -17,27 +17,34 @@
  secondTag |string |鍙�� |浜岀骇鍒嗙被
  name |string |鍙�� |鐗╂枡鍒悕
  specs |string |鍙�� |瑙勬牸
-  model |string |鍙�� |鍨嬪彿
-  color |string |鍙�� |棰滆壊
-  brand |string |鍙�� |鍝佺墝
-  unit |string |鍙�� |鍗曚綅
-  price |double |鍙�� |鍗曚环
-  sku |string |鍙�� |sku
-  units |double |鍙�� |鍗曚綅閲�
-  barcode |string |鍙�� |鏉＄爜
-  origin |string |鍙�� |浜у湴
-  manu |string |鍙�� |鍘傚
-  manuDate |string |鍙�� |鐢熶骇鏃ユ湡
-  itemNum |string |鍙�� |鍝侀」鏁�
-  weight |double |鍙�� |閲嶉噺
-  length |double |鍙�� |闀垮害
-  volume |double |鍙�� |浣撶Н
-  threeCode |string |鍙�� |涓夋柟缂栫爜
-  supp |string |鍙�� |渚涘簲鍟�
-  suppCode |string |鍙�� |渚涘簲鍟嗙紪鐮�
-  deadTime |string |鍙�� |淇濊川鏈�
  status |int |鍙�� |鐘舵�亄0:绂佺敤,1:姝ｅ父}
  memo |string |鍙�� |澶囨敞
+  mainHost |string |鍙�� |涓昏浠撳簱
+  mainSource |string |鍙�� |涓昏鏉ユ簮
+  barcode |string |鍙�� |鏉＄爜
+  cyclePickCode |string |鍙�� |寰幆鐩樼偣鐮�
+  locationStock |string |鍙�� |瀛樻斁浣嶇疆
+  material |string |鍙�� |鏉愯川
+  model |double |鍙�� |鏈哄瀷
+  decrees |string |鍙�� |鍒朵护
+  weight |string |鍙�� |閲嶉噺
+  imgNum |string |鍙�� |鍥惧彿
+  purchasingUnits |string |鍙�� |閲囪喘鍗曚綅
+  processNumber |string |鍙�� |宸ヨ壓缂栧彿
+  bom |string |鍙�� |鎸囧畾bom
+  safeNum |string |鍙�� |瀹夊叏瀛橀噺
+  miniCount |string |鍙�� |鏈�浣庤ˉ閲�
+  replenishmentNum |string |鍙�� |琛ヨ揣鍊嶉噺
+  tmp1 |string |鍙�� |鑷畾涔�1
+  tmp2 |string |鍙�� |鑷畾涔�2
+  tmp3 |string |鍙�� |鑷畾涔�3
+  restockDemand |string |鍙�� |鎸夐渶姹傝ˉ璐�
+  lapse |string |鍙�� |澶辨晥
+  shortcuts |string |鍙�� |蹇嵎鐮�
+  units |string |鍙�� |璁￠噺鍗曚綅
+  length |string |鍙�� |闀垮害
+  width |string |鍙�� |瀹藉害
+  height |string |鍙�� |楂樺害
 sign |string |鍙�� |绛惧悕
diff --git a/zy-asrs-openapi/src/main/webapp/views/md/createMat_old.md b/zy-asrs-openapi/src/main/webapp/views/md/createMat_old.md
new file mode 100644
index 0000000..c50a327
--- /dev/null
+++ b/zy-asrs-openapi/src/main/webapp/views/md/createMat_old.md
@@ -0,0 +1,142 @@
+## 娣诲姞鐗╂枡淇℃伅
+
+- **鎺ュ彛璇存槑锛�** 娣诲姞鐗╂枡淇℃伅
+- **鎺ュ彛鍦板潃锛�** /api/createMat
+
+#### 璇锋眰鍙傛暟
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+Header | |蹇呭～ |璇锋眰鎶ユ枃澶�
+ appkey |string |蹇呭～ |瀵嗛挜绠＄悊涓敓鎴恆ppkey
+Body | |蹇呭～ |
+ mats |array | |
+  matnr |string |蹇呭～ |鐗╂枡缂栧彿
+  maktx |string |鍙�� |鐗╂枡鍚嶇О
+  firstTag |string |鍙�� |涓�绾у垎绫�
+  secondTag |string |鍙�� |浜岀骇鍒嗙被
+  name |string |鍙�� |鐗╂枡鍒悕
+  specs |string |鍙�� |瑙勬牸
+  model |string |鍙�� |鍨嬪彿
+  color |string |鍙�� |棰滆壊
+  brand |string |鍙�� |鍝佺墝
+  unit |string |鍙�� |鍗曚綅
+  price |double |鍙�� |鍗曚环
+  sku |string |鍙�� |sku
+  units |double |鍙�� |鍗曚綅閲�
+  barcode |string |鍙�� |鏉＄爜
+  origin |string |鍙�� |浜у湴
+  manu |string |鍙�� |鍘傚
+  manuDate |string |鍙�� |鐢熶骇鏃ユ湡
+  itemNum |string |鍙�� |鍝侀」鏁�
+  weight |double |鍙�� |閲嶉噺
+  length |double |鍙�� |闀垮害
+  volume |double |鍙�� |浣撶Н
+  threeCode |string |鍙�� |涓夋柟缂栫爜
+  supp |string |鍙�� |渚涘簲鍟�
+  suppCode |string |鍙�� |渚涘簲鍟嗙紪鐮�
+  deadTime |string |鍙�� |淇濊川鏈�
+  status |int |鍙�� |鐘舵�亄0:绂佺敤,1:姝ｅ父}
+  memo |string |鍙�� |澶囨敞
+ sign |string |鍙�� |绛惧悕
+
+
+璇锋眰绀轰緥锛�
+
+```
+{
+ "Header":{
+ "appkey":"6cfb9f11935b4d0e1740f41598970c97",
+ },
+ "Body":{
+ "mats": [
+ {
+ "firstTag": "娴嬭瘯浜岀骇鍒嗙被1",
+ "secondTag": "娴嬭瘯涓夌骇鍒嗙被1",
+ "matnr": "test001",
+ "maktx": "娴嬭瘯鐗╂枡1",
+ "name": "",
+ "specs": "",
+ "model": "",
+ "color": "",
+ "brand": "",
+ "unit": "",
+ "price": "",
+ "sku": "",
+ "units": "",
+ "barcode": "",
+ "origin": "",
+ "manu": "",
+ "manuDate": "",
+ "itemNum": "",
+ "weight": "",
+ "length": "",
+ "volume": "",
+ "threeCode": "",
+ "supp": "",
+ "suppCode": "",
+ "deadTime": "",
+ "status": 1,
+ "memo": ""
+ },
+ {
+ "firstTag": "娴嬭瘯浜岀骇鍒嗙被1",
+ "secondTag": "娴嬭瘯涓夌骇鍒嗙被1",
+ "matnr": "test002",
+ "maktx": "娴嬭瘯鐗╂枡2",
+ "name": "",
+ "specs": "",
+ "model": "",
+ "color": "",
+ "brand": "",
+ "unit": "",
+ "price": "",
+ "sku": "",
+ "units": "",
+ "barcode": "",
+ "origin": "",
+ "manu": "",
+ "manuDate": "",
+ "itemNum": "",
+ "weight": "",
+ "length": "",
+ "volume": "",
+ "threeCode": "",
+ "supp": "",
+ "suppCode": "",
+ "deadTime": "",
+ "status": 1,
+ "memo": ""
+ }
+ ],
+ "sign": "8a7036cfe218e12f50f9107e9eb4a437"
+ }
+}
+
+```
+
+
+#### 杩斿洖缁撴灉
+
+鍙傛暟鍚嶇О |绫诲瀷 |鍑虹幇瑕佹眰 |鎻忚堪
+:---- |:--- |:------ |:---
+code |int |蹇呭～ |鍝嶅簲鐮侊紝浠ｇ爜瀹氫箟璇疯鈥滈檮褰旳 鍝嶅簲鍚楄鏄庘��
+msg |string |蹇呭～ |
+data |object |鍙�� |杩斿洖娣诲姞鎴愬姛鐨勭墿鏂欐暟閲�
+
+绀轰緥锛�
+
+```
+{
+ "msg": "鎿嶄綔鎴愬姛",
+ "code": 200,
+ "data": 2
+}
+```
+
+## 闄勫綍A 鍝嶅簲鐮佽鏄�
+
+鍝嶅簲鐮� |璇存槑
+:---- |:---
+200 |澶勭悊鎴愬姛
+500 |绯荤粺鍐呴儴閿欒
\ No newline at end of file
--
Gitblit v1.9.1