From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 18 一月 2025 17:06:18 +0800 Subject: [PATCH] # 6. 大屏添加作业类型 (全盘,还是分拣 IOType) 10.平库出库时,当前平库ID是写死在Sql里,需修改 11.平库出库没有判断是否预约出库,且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细,可以再次拣货,拣货明细需添加一个拣货状态 47. 确认发货前,需判断是否已绑定至集货区 48. CTU出库后,库位103不再删除原有库位信息 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java | 158 ++++++++++++++++++++++++++-------------------------- 1 files changed, 79 insertions(+), 79 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java index 7876a3d..8772755 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/template/OrderTemplate.java @@ -1,79 +1,79 @@ -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 OrderTemplate { - - //璁㈠崟缂栧彿 - @ApiModelProperty(value= "璁㈠崟缂栧彿") - private String orderNo; - - //鍗曟嵁绫诲瀷 - @ApiModelProperty(value= "鍗曟嵁绫诲瀷") - private String orderType; - - //鍟嗗搧缂栧彿 - @ApiModelProperty(value= "鍟嗗搧缂栧彿") - private String matnr; - - //鎵瑰彿 - @ApiModelProperty(value= "鎵瑰彿") - private String batch; - - //鏁伴噺 - @ApiModelProperty(value= "鏁伴噺") - private Double anfme; - - //澶囨敞 - @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 OrderTemplate { + + //璁㈠崟缂栧彿 + @ApiModelProperty(value= "璁㈠崟缂栧彿") + private String orderNo; + + //鍗曟嵁绫诲瀷 + @ApiModelProperty(value= "鍗曟嵁绫诲瀷") + private String orderType; + + //鍟嗗搧缂栧彿 + @ApiModelProperty(value= "鍟嗗搧缂栧彿") + private String matnr; + + //鎵瑰彿 + @ApiModelProperty(value= "鎵瑰彿") + private String batch; + + //鏁伴噺 + @ApiModelProperty(value= "鏁伴噺") + private Double anfme; + + //澶囨敞 + @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