From 63a8aef96d82206561d27a1584eb3aaeddc9d0ae Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 18 Apr 2021 21:21:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 13 ++++++--- .../estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 4 +++ .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 4 --- .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 +++ .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 +++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/model/PlanRecord.java | 34 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/WorkRecord.java | 22 ++++++++++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 +-- 10 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 9a9eb42..3a8b8ff 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -97,12 +97,17 @@ public class BaseOrder extends BaseAPS { @Column(name="VALID_ORDER") @ApiParam(value ="有效订单") @FieldAnnotation(modify = false) - private ApsEnumUtil.ORDER_VALID_TYPE validOrder = ApsEnumUtil.ORDER_VALID_TYPE.VALID; + private Boolean validOrder = true; - @Column(name="DELAY") - @ApiParam(value ="是否延期") + @Column(name="INVALID_REASON") + @ApiParam(value ="无效原因") @FieldAnnotation(modify = false) - private Boolean delay = false; + private String invalidReason; + + @Column(name="DELAY_TIME") + @ApiParam(value ="延期时间") + @FieldAnnotation(modify = false) + private Integer delayTime; @JsonBackReference public List getWorks() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 9a6c5e3..ee8ddc3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -27,7 +27,7 @@ public class FieldSetRule extends BaseRule { private static final long serialVersionUID = 6880145972942618559L; @Column(name="BEAN") @ApiParam(value ="实体名") - private ApsEnumUtil.FIELD_SET_BEAN bean; + private String bean; @Column(name="FILTER") @ApiParam(value ="筛选") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e214454..626de94 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -29,6 +29,10 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="物料筛选") private String materialFilter; + @Column(name="ROUTING_FILTER") + @ApiParam(value ="工艺路线筛选") + private String routingFilter; + @Column(name="INPUT_FILTER") @ApiParam(value ="输入筛选") private String inputFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 1a781bc..36eceaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -90,10 +90,6 @@ public class Operation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; - @Column(name="MANU_OPER") - @ApiParam(value ="是否手工工序") - private Boolean manuOper; - public ProductRouting getProductRouting() { return BeanRelation.get(this, EOperation.ProductRouting); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 2989ad5..7911052 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -61,6 +61,10 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(defaultValue = "WAITING") private ApsEnumUtil.SALES_ORDER_STATUS orderStatus; + @Column(name="DELIVER_RATE") + @ApiParam(value ="发货百分比") + private Double deliverRate; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 669df55..95847b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -45,4 +45,8 @@ public class SysParam extends BaseAPS { @ApiParam(value ="规则组id") @FieldAnnotation(display = false) private Long ruleGroupId; + + @Column(name="INVENTORY_RATE") + @ApiParam(value ="库存误差百分比") + private Double inventoryRate; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index fc2f1fe..a1d2b89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -164,6 +164,8 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long dynSplitWorkId; + private transient boolean hasOptimized = false; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java new file mode 100644 index 0000000..eb35e2c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; +import cn.estsh.i3plus.pojo.aps.bean.Resource; +import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import lombok.Data; + +/** + * @Description : 计划记录 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ +@Data +public class PlanRecord { + /** + * 需要插入的工作计划 + */ + private WorkPlan plan; + /** + * 插入到目标资源 + */ + private Resource resource; + /** + * 插入到目标工作计划前面 + */ + private WorkPlan postPlan; + + /** + * 插入到指定炉资源上 + */ + private FurnacePlan furnacePlan; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java new file mode 100644 index 0000000..eb94010 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/WorkRecord.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.Work; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 工作排程记录 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ +@Data +public class WorkRecord { + private Work work; + private Work splitWork; + private PlanRecord mainPlan; + private List assPlans = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index dfe9ddf..8eb25cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -741,8 +741,8 @@ public class ApsEnumUtil { public enum WORK_STATUS { NOPLAN("NOPLAN", "未计划"), PLANDONE("PLANDONE", "计划完毕"), - INDICATIONDONE("INDICATIONDONE", "指示完毕"), - CONFIRM("CONFIRM", "确认"), + INDICATIONDONE("INDICATIONDONE", "锁定"), + CONFIRM("CONFIRM", "下发"), STARTPRODUCT("STARTPRODUCT", "开始生产"), FINISH("FINISH", "完成"); From 9ed1a5d36ada3ee45617e32b4b5bcbfada2b8915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E7=94=9F?= <337942886@qq.com> Date: Wed, 21 Apr 2021 10:02:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?15241=2019081=20=E2=80=94=E2=80=94=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E8=B4=A7=E8=BF=9B=E5=BA=A6=E6=8A=A5=E8=A1=A8=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=9C=80=E6=8E=92=E5=BA=8F=EF=BC=8C2021-04-17=2015108=2019048-?= =?UTF-8?q?-=20=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=88=B0=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20--20210417?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 2ae023d..25b4bb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -250,6 +250,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", public Integer lockVersion; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient @ApiParam("项目代码") private String prodCfgTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 838218f..6312a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + @Transient @ApiParam("明细状态") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) private String itemStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 889e64c..b194f43 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean { private String ZoneNo; @Transient + @ApiParam("历史数据") + private Boolean lookHistory; + + + @Transient @ApiParam("交易类型名称") private String transTypeName; From 4f697d51ecf86f2b146a5ccb4f59c4a4461e019d Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 21 Apr 2021 10:06:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 +- .../java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index be86c15..e6c5b73 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.util.List; @@ -101,6 +102,16 @@ public class ImportDetail extends BaseAPS { @FieldAnnotation(relation = "Project", property = false) private Long projectId; + @Lob + @Column(name="INNER_FILTER") + @ApiParam(value ="内部对象筛选") + private String innerFilter; + + @Lob + @Column(name="OUTTER_FILTER") + @ApiParam(value ="外部对象筛选") + private String outterFilter; + @FieldAnnotation(property = false) private transient ImportDataModel model; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index cbd5e13..be15e07 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -75,7 +75,7 @@ public class StandOperation extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="工序类型") - private ApsEnumUtil.SANLUX_OPERATION_TYPE type; + private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL; public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 8eb25cd..e948e9b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1260,7 +1260,8 @@ public class ApsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SANLUX_OPERATION_TYPE { NORMAL("NORMAL", "正常工序"), - FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"); + FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"); private String value; private String description; From 62ae1d9a134f2d1b46e20b427fb6bcee7710095e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 21 Apr 2021 11:11:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9EqrCode=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=8D=A1=E6=96=AF=E9=A9=AC=E6=8A=A5=E8=A1=A8=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=B7=A5=E5=BA=8F=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2?= =?UTF-8?q?CMS=E6=A0=87=E7=AD=BE=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 27b88aa..b463dcc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "FN_LOCATION_NO") @ApiParam("炉内位置代码") private String fnLocationNo; + + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; } From e7e0580c9a143c417e1803b8aebf41265d446198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 21 Apr 2021 15:30:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=9015381=2020027--MES=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2BH=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=A6=96=E3=80=81=E4=B8=AD=E3=80=81=E6=9C=AB?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=9E=E6=97=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E6=95=85=E9=9C=80=E8=A6=81=E8=B7=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AE=9E=E7=8E=B0=E5=85=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=88=E6=9E=9C-2021-04-23=E3=80=91=20?= =?UTF-8?q?=E3=80=9015197=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=A6=96=E6=A3=80=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8-=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=8C=89=E7=85=A7=E5=B7=A5=E5=8D=95=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=A6=96=E6=A3=80-20210421=20=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index f6d51c4..b824074 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -17,6 +17,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -138,4 +139,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("质检单检测记录id") private Long qcOrderRecordId; + @Transient + @ApiParam("质检单集合") + private List orderNoList; + } 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 5ab12ee..75a7485 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 @@ -1091,12 +1091,15 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); - if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { - DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); - } +// if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { +// DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean); +// } if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) { DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); } + if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) { + DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean); + } return packBean; } From ab8686ae2c22bbe1f922b0cde4d5700e1d2e921e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 21 Apr 2021 16:43:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89mongo=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-screen/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 071fe58..4b20d00 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 4.0.0