From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/MatTemplate.java | 342 ++++++++++++++++++++++++++++----------------------------
1 files changed, 171 insertions(+), 171 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/MatTemplate.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/MatTemplate.java
index e53308e..b660f5a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/MatTemplate.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/MatTemplate.java
@@ -1,171 +1,171 @@
-package com.zy.asrs.wms.asrs.entity.template;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.zy.asrs.common.utils.Synchro;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-public class MatTemplate {
-
- //涓�绾у垎绫�
- @ApiModelProperty(value= "涓�绾у垎绫�")
- private String firstTag;
-
- //浜岀骇鍒嗙被
- @ApiModelProperty(value= "浜岀骇鍒嗙被")
- private String secondTag;
-
- //鍟嗗搧缂栧彿
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- //鍟嗗搧鍚嶇О
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- //鍒悕
- @ApiModelProperty(value= "鍒悕")
- private String name;
-
- //瑙勬牸
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- //鍨嬪彿
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- //棰滆壊
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- //鍝佺墝
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- //鍗曚綅
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- //鍗曚环
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- //sku
- @ApiModelProperty(value= "sku")
- private String sku;
-
- //鍗曚綅閲�
- @ApiModelProperty(value= "鍗曚綅閲�")
- private String units;
-
- //鏉＄爜
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- //浜у湴
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- //鍘傚
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- //鐢熶骇鏃ユ湡
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- //鍝侀」鏁�
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- //閲嶉噺
- @ApiModelProperty(value= "閲嶉噺")
- private String weight;
-
- //闀垮害
- @ApiModelProperty(value= "闀垮害")
- private String length;
-
- //浣撶Н
- @ApiModelProperty(value= "浣撶Н")
- private String volume;
-
- //涓夋柟缂栫爜
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- //渚涘簲鍟�
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- //渚涘簲鍟嗙紪鐮�
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- //淇濊川鏈�
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- //瀹夊叏搴撳瓨涓婇檺
- @ApiModelProperty(value= "瀹夊叏搴撳瓨涓婇檺")
- private Double safeStockLimit;
-
- //瀹夊叏搴撳瓨涓嬮檺
- @ApiModelProperty(value= "瀹夊叏搴撳瓨涓嬮檺")
- private Double safeStockMinimum;
-
- //鏈夋晥鏈�
- @ApiModelProperty(value= "鏈夋晥鏈�")
- private String validity;
-
- //澶囨敞
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
- //鍔ㄦ�佹墿灞曞瓧娈�
- public transient Map<String, Object> dynamicFields = new HashMap<>();
-
- @JsonAnyGetter
- public Map<String,Object> getDynamicFields() {
- return dynamicFields;
- }
-
- public void syncFieldMap(Map<String, Object> map) {
- ArrayList<String> keys = new ArrayList<>();
- Field[] fields = this.getClass().getDeclaredFields();
- for (Field field : fields) {
- keys.add(field.getName());
- }
- keys.add("detlId");
-
- Map<String, Object> dynamicFields = new HashMap<>();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- if (keys.contains(entry.getKey())) {
- continue;
- }
- dynamicFields.put(entry.getKey(), entry.getValue());
- }
-
- this.dynamicFields = dynamicFields;
- }
-
- public String getFieldString(String key) {
- return dynamicFields.get(key).toString();
- }
-
- public void setField(String key, Object value) {
- dynamicFields.put(key, value);
- }
-
-}
+package com.zy.asrs.wms.asrs.entity.template;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class MatTemplate {
+
+ //涓�绾у垎绫�
+ @ApiModelProperty(value= "涓�绾у垎绫�")
+ private String firstTag;
+
+ //浜岀骇鍒嗙被
+ @ApiModelProperty(value= "浜岀骇鍒嗙被")
+ private String secondTag;
+
+ //鍟嗗搧缂栧彿
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ //鍟嗗搧鍚嶇О
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ //鍒悕
+ @ApiModelProperty(value= "鍒悕")
+ private String name;
+
+ //瑙勬牸
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ //鍨嬪彿
+ @ApiModelProperty(value= "鍨嬪彿")
+ private String model;
+
+ //棰滆壊
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ //鍝佺墝
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
+
+ //鍗曚綅
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
+
+ //鍗曚环
+ @ApiModelProperty(value= "鍗曚环")
+ private Double price;
+
+ //sku
+ @ApiModelProperty(value= "sku")
+ private String sku;
+
+ //鍗曚綅閲�
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ private String units;
+
+ //鏉＄爜
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ //浜у湴
+ @ApiModelProperty(value= "浜у湴")
+ private String origin;
+
+ //鍘傚
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ //鐢熶骇鏃ユ湡
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ private String manuDate;
+
+ //鍝侀」鏁�
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ private String itemNum;
+
+ //閲嶉噺
+ @ApiModelProperty(value= "閲嶉噺")
+ private String weight;
+
+ //闀垮害
+ @ApiModelProperty(value= "闀垮害")
+ private String length;
+
+ //浣撶Н
+ @ApiModelProperty(value= "浣撶Н")
+ private String volume;
+
+ //涓夋柟缂栫爜
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ private String threeCode;
+
+ //渚涘簲鍟�
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supp;
+
+ //渚涘簲鍟嗙紪鐮�
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ private String suppCode;
+
+ //淇濊川鏈�
+ @ApiModelProperty(value= "淇濊川鏈�")
+ private String deadTime;
+
+ //瀹夊叏搴撳瓨涓婇檺
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨涓婇檺")
+ private Double safeStockLimit;
+
+ //瀹夊叏搴撳瓨涓嬮檺
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨涓嬮檺")
+ private Double safeStockMinimum;
+
+ //鏈夋晥鏈�
+ @ApiModelProperty(value= "鏈夋晥鏈�")
+ private String validity;
+
+ //澶囨敞
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+ //鍔ㄦ�佹墿灞曞瓧娈�
+ public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+ @JsonAnyGetter
+ public Map<String,Object> getDynamicFields() {
+ return dynamicFields;
+ }
+
+ public void syncFieldMap(Map<String, Object> map) {
+ ArrayList<String> keys = new ArrayList<>();
+ Field[] fields = this.getClass().getDeclaredFields();
+ for (Field field : fields) {
+ keys.add(field.getName());
+ }
+ keys.add("detlId");
+
+ Map<String, Object> dynamicFields = new HashMap<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ if (keys.contains(entry.getKey())) {
+ continue;
+ }
+ dynamicFields.put(entry.getKey(), entry.getValue());
+ }
+
+ this.dynamicFields = dynamicFields;
+ }
+
+ public String getFieldString(String key) {
+ return dynamicFields.get(key).toString();
+ }
+
+ public void setField(String key, Object value) {
+ dynamicFields.put(key, value);
+ }
+
+}
--
Gitblit v1.9.1