From 563955570daf19e4d794e6fbc97c6db6e464eea3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 31 Oct 2019 22:04:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201078?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 9 +++++++-- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 ----- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 11 ++++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ----- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 - 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 41e5a23..182a1d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") + @Column(name = "UNIT") @ApiParam("包装规格数量") - private String nuit; + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index f2aee4d..a302a3e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -112,10 +112,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; @@ -178,7 +174,6 @@ public class MesProduceSn extends BaseBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 08e041a..3314cf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") - @ApiParam("包装规格数量") - private String nuit; + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index c89db3f..d0dfa6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -83,7 +83,7 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否投料配置") private Integer isFeed; - @Column(name = "is_BIND_KEY") + @Column(name = "IS_BIND_KEY") @ApiParam(value = "是否绑定关键件") private Integer isBindKey; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index fa582cd..842e8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -109,10 +109,6 @@ public class MesProduceSn extends BaseBean { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型") private Integer snType; @@ -171,7 +167,6 @@ public class MesProduceSn extends BaseBean { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index deb4a29..a6b6ce2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -880,7 +880,6 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean); return packBean; From 80c340308a95ea1c9d1fc8ee827df266a8643b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 31 Oct 2019 22:43:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3POJO=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 33e46a0..eee5432 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -76,12 +76,12 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 目标实体对象的名字，多个字段用半角逗号分隔 */ - @Column(name = "DEST_BEAN_NAME", length = 50) + @Column(name = "DEST_BEAN_NAME", length = 500) public String destBeanName; /** * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 */ - @Column(name = "DEST_PK_PROPERTIES", length = 50) + @Column(name = "DEST_PK_PROPERTIES", length = 500) public String destPkProperties; /** * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 From cfd7f5276ef76d01778f41118ca3ef0b2c902d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 1 Nov 2019 13:28:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 16 ++++++++++ .../pojo/model/lac/LacCommandStackModel.java | 37 +++------------------- .../java/cn/estsh/i3plus/pojo/model/lac/Task.java | 3 +- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 1b2c71a..5859ae1 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -132,6 +132,22 @@ public class LacSuitTask extends BaseBean { private List lacSuitTaskParamList; @Transient + @ApiParam(value ="适配原始参数") + private Object orginParam; + + @Transient + @ApiParam(value ="适配转换后参数") + private Object transParam; + + @Transient + @ApiParam(value ="原始报文") + private Object orginMessage; + + @Transient + @ApiParam(value ="转换后报文") + private Object transMessage; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index c141c5a..c9fb540 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -1,13 +1,8 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * @Description : lac指令集model @@ -35,23 +30,14 @@ public class LacCommandStackModel { private LacSuitRequest request; /** - * 响应数据 - */ - private LacSuitResponse response; - - /** - * 任务原始报文 - * key : 任务编号 - * value ： 原始报文 + * 请求XML */ - private Map orginMessageMap = new ConcurrentHashMap<>(); + private String requestXml; /** - * 任务转换后报文 - * key : 任务编号 - * value ： 转换后报文 + * 响应数据 */ - private Map transMessageMap = new ConcurrentHashMap<>(); + private LacSuitResponse response; /** * 异常信息 @@ -68,7 +54,7 @@ public class LacCommandStackModel { this.recordId = commandStackRecord.getId(); } - public List getTaskRequestParam(String taskCode){ + public Object getTaskRequestParam(String taskCode){ for (Task task : this.getRequest().getTaskList()) { if(task.getCode().equals(taskCode)){ return task.getParamList(); @@ -77,17 +63,4 @@ public class LacCommandStackModel { return null; } - public void putOrginMessage(LacSuitTask lacSuitTask,Object orginMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.orginMessageMap.put(lacSuitTask.getTaskInstanceId(), orginMessage == null ? StringUtils.EMPTY : orginMessage); - } - public void putTransMessage(LacSuitTask lacSuitTask,Object transMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.transMessageMap.put(lacSuitTask.getTaskInstanceId(), transMessage == null ? StringUtils.EMPTY : transMessage); - } - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index 3ea6970..839e2e3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.lac; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; -import java.util.List; /** * @Description : @@ -17,5 +16,5 @@ public class Task { private String code; - private List paramList; + private Object paramList; } From 921be6b0f211a877ade5a3c49350017f190b77f7 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 1 Nov 2019 14:13:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=AE=A1=E5=88=92=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 58 ++++++++++++++++------ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 32 ++++++------ .../i3plus/pojo/aps/holders/EShippingTime.java | 8 +++ .../i3plus/pojo/aps/model/ResourceCompose.java | 3 +- .../src/main/resources/relations/ShippingTime.xml | 11 ++++ 5 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 9e637b2..25967a8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -21,27 +23,55 @@ import javax.persistence.Table; @Table(name = "APS_SHIPPING_TIME") @Api("运输时间") public class ShippingTime extends BaseAPS { + @Column(name="TIME") + @ApiParam(value ="运输时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private Integer priority; + @Column(name="PREV_RES_CODE") - @ApiParam(value ="前资源编码") - private String prevResCode; + @ApiParam(value ="前资源对象Id") + private Long prevResId; @Column(name="POST_RES_CODE") - @ApiParam(value ="后资源编码") - private String postResCode; + @ApiParam(value ="后资源对象Id") + private Long postResId; @Column(name="PREV_STAND_CODE") - @ApiParam(value ="前标准工序编码") - private String prevStandCode; + @ApiParam(value ="前标准工序对象Id") + private Long prevStandId; @Column(name="POST_STAND_CODE") - @ApiParam(value ="后标准工序编码") - private String postStandCode; + @ApiParam(value ="后标准工序对象Id") + private Long postStandId; - @Column(name="TIME") - @ApiParam(value ="运输时间") - private String time; + public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - private Integer priority; + public void setPrevRes(Resource res) { + this.prevResId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EShippingTime.PrevRes, res); + } + + public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } + + public void setPostRes(Resource res) { + this.postResId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EShippingTime.PostRes, res); + } + + public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} + + public void setPrevStand(StandOperation stand) { + this.prevStandId = stand != null ? stand.getId() : 0l; + BeanRelation.set(this, EShippingTime.PrevStand, stand); + } + + public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } + + public void setPostStand(StandOperation stand) { + this.postStandId = stand != null ? stand.getId() : 0l; + BeanRelation.set(this, EShippingTime.PostStand, stand); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 700a1cf..fa3db91 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -202,30 +202,26 @@ public class BeanRelation { } } - public static List lastList(BaseBean entity, Enum... args) { - List result = new ArrayList(); - lastListImpl(result, entity, null, args, 0); - return result; - } - - public static List lastList(BaseBean entity, Predicate filter, Enum... args) { - List result = new ArrayList(); - lastListImpl(result, entity, filter, args, 0); + public static List lastList(BaseBean bean, Enum... holders) { + List result = new ArrayList<>(); + lastListImpl(result, bean, bean, holders, 0); return result; } - - @SuppressWarnings("unchecked") - private final static boolean lastListImpl(List result, BaseBean entity, Predicate filter, - Enum[] args, int index) { - if (index >= args.length) { + private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, + Enum[] holders, int index) { + if (index >= holders.length) { + if (self == bean) { + return false; + } index = 0; + self = bean; } boolean bNotLast = true; - List relaEntities = list(entity, args[index]); - for (BaseBean relaEntity : relaEntities) { - if (lastListImpl(result, relaEntity, filter, args, index + 1)) { - result.add((T)relaEntity); + List nextBeans = list(bean, holders[index]); + for (BaseBean nextBean : nextBeans) { + if (lastListImpl(result, nextBean, self, holders, index + 1)) { + result.add((T)nextBean); bNotLast = false; } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java new file mode 100644 index 0000000..100379b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EShippingTime { + PrevRes, // 前资源 + PostRes, // 后资源 + PrevStand, // 前标准工序 + PostStand // 后标准工序 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java index 314ecfa..b735390 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.aps.bean.WorkResource; +import java.util.ArrayList; import java.util.List; /** @@ -14,5 +15,5 @@ import java.util.List; **/ public class ResourceCompose { public WorkResource resource; - public List assResource; + public List assResource = new ArrayList<>(); } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml new file mode 100644 index 0000000..c51acb0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file