From 2fd1b8942537d2e5e62e1db96b47ed507ec5d202 Mon Sep 17 00:00:00 2001 From: shun Date: Thu, 17 Dec 2020 13:25:34 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7WMS?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/AutoPickingModel.java | 35 ++++++++++++++++++++ .../pojo/wms/modelbean/MinAndMaxStockModel.java | 37 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java new file mode 100644 index 0000000..39decb8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +/** + * @Description : 自动生成领料看板model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:34 + * @Modify : + **/ +@Data +@Api("自动生成领料看板") +public class AutoPickingModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("计划日期") + private String planDate; + @ApiParam("sap单号") + private String erpSrcNo; + @ApiParam("状态") + private String orderStatus; + @ApiParam("父零件号") + private String partNo; + @ApiParam("简称") + private String partNameRdd; + @ApiParam("完成数量") + private Double printQty; + @ApiParam("总数量") + private Double qty; + @ApiParam("操作时间") + private String modifyDateTime; + @ApiParam("操作人") + private String modifyUser; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java new file mode 100644 index 0000000..642c04d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 最低库存/最高库存 预警看板 Model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:55 + * @Modify : + **/ +@Data +@Api("最低库存/最高库存预警看板") +public class MinAndMaxStockModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("存储区") + private String zoneNo; + @ApiParam("库位") + private String locateNo; + @ApiParam("零件号") + private String partNo; + @ApiParam("简称") + private String partNameAdd; + @ApiParam("数量") + private Double qty; + @ApiParam("最低库存") + private Double min; + @ApiParam("最高库存") + private Double max; + @ApiParam("件号") + private String partTypeDesc; + @ApiParam("包装规格") + private String snp; + +} From 7e8970f3e2f5bf81324a8bddc8e1b72fde342868 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 17 Dec 2020 14:42:03 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index b9836f9..574d56d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -18,7 +18,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PART_CHECK_DATA_TYPE { ALL_DATA(1, "所有数据"), - LAST_DATA(2, "最后一条数据"); + LAST_DATA(2, "最后一条数据"), + ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 55cf9e7..09972c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -31,6 +31,9 @@ public class DataReviewModel { @ApiParam("对象代码") private String objectCode; + @ApiParam("末检是否合格") + private String lastDataResult; + @ApiParam("是否合格标识") private Integer reviewFlag; @@ -38,7 +41,7 @@ public class DataReviewModel { private String reviewResult; @ApiParam("显示标识") - private String showFlag; + private Integer showFlag; @ApiParam("颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java index ae6e97a..5e1307d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -24,4 +24,7 @@ public class ProductDataCacheModel { @ApiParam("创建时间") private String createDatetime; + @ApiParam("是否必须是合格") + private Boolean isNecessary = false; + } From 1595f68723ab6a6ee53d67b34a047b6435fa5dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 17 Dec 2020 17:51:56 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#3036?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsUserPrinterInfo.java | 38 ++++++++++++++++++++++ .../repository/WmsUserPrinterInfoRepository.java | 14 ++++++++ 2 files changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java new file mode 100644 index 0000000..2a8b64a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description 用户打印机绑定信息 + * @Reference + * @Author dragon + * @CreateDate 2020/12/17 15:38 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="WMS_USER_PRINTER_INFO") +@Api("用户打印机绑定信息") +public class WmsUserPrinterInfo extends BaseBean{ + + @Column(name="PRINTER_NO") + @ApiParam("打印机编号") + private String printerNo; + + @Column(name="USER_NO") + @ApiParam("用户编码") + private String userNo; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java new file mode 100644 index 0000000..c671f1b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUserPrinterInfo; + +/** + * @Description 用户打印机绑定信息DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/17 15:42 + * @Modify + */ +public interface WmsUserPrinterInfoRepository extends BaseRepository { +} From cc99971690f7d0aaa0c01a14f398696f0eae65fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Dec 2020 18:13:26 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=9013140=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=85=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E4=B8=8E=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2?= =?UTF-8?q?--20201221=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 11 +++++++++++ 3 files changed, 19 insertions(+) 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 629f60b..158ed97 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 @@ -199,6 +199,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装编号集合") private List packageNoList = new ArrayList<>(); + @Transient + @ApiParam(value = "生产线名称") + private String workCenterName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index fafc076..a9c9324 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -73,6 +73,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("批次") private String lotNo; + @Transient + @ApiParam("产品条码") + private String productSn; + } 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 24e0a52..e822848 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 @@ -3687,4 +3687,15 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesPackage(MesPackage mesPackage) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); + DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); + return packBean; + } + } From ade905350227a9972a2e18bd91722f85b55e6bae Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 10:25:21 +0800 Subject: [PATCH 05/11] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 24e0a52..9ce9917 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 @@ -2084,7 +2084,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); From c067c671a9348986707c2e9a859ec49eb4883632 Mon Sep 17 00:00:00 2001 From: shun Date: Fri, 18 Dec 2020 10:43:08 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java index 39decb8..cfac2ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -19,7 +19,7 @@ public class AutoPickingModel { @ApiParam("sap单号") private String erpSrcNo; @ApiParam("状态") - private String orderStatus; + private int orderStatus; @ApiParam("父零件号") private String partNo; @ApiParam("简称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java index 642c04d..5c4866a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -32,6 +32,6 @@ public class MinAndMaxStockModel { @ApiParam("件号") private String partTypeDesc; @ApiParam("包装规格") - private String snp; + private Double snp; } From 23bbde205707f357400ff3eb7d15c61127c6f95d Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:13:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?13315=2020027-=E8=BF=94=E4=BF=AE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4=E7=A0=81-202012-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index ef071db..0847a20 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("维修状态名称") private String repairStatusName; + @Transient + @ApiParam("产品二维码") + private String productSn; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } From 3c6b869821d31881d7a973614aa041dc2f924bcf Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:19:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 09faa0d..efd9773 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 @@ -2081,7 +2081,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode); if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); @@ -2093,7 +2093,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); } if (mesProduceSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); @@ -2102,7 +2102,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean); } if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); From 419fe3a62e8ab800576f04f6e871d33cbd7fb417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 18 Dec 2020 15:04:02 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=9013330=2020027--BI=E8=AF=A6?= =?UTF-8?q?=E6=83=85----=E4=BA=A7=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85?= =?UTF-8?q?=E5=86=B5--=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E7=8E=87?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96--2020-12-18=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 17d1089..73a1815 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -20,4 +21,8 @@ public class ProductBiSeriesModel { private String type; @ApiParam("显示的数据") private List data; + @ApiParam("实际数量集合") + private List snQtyList = new ArrayList<>(); + @ApiParam("计划数量集合") + private List planQtyList = new ArrayList<>(); } From ded63e25dbc59a9ba59fad1f77a8d313ec5af24c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Dec 2020 21:07:54 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=9D=A4=E6=B3=B0=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/wms/bean/WmsPOMasterDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 8ab7b56..1ccf8d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -278,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean { this.rcQty = rcQty; } - public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){ + public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){ this.orderNo = orderNo; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.createDatetime = createDatetime; } public WmsPOMasterDetails( From 6c2569ee924c59c89a06494f4f378cf2b2743050 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 19 Dec 2020 07:02:45 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 4173305..7023c0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -19,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; @@ -923,4 +923,14 @@ public class WmsStockSn extends BaseBean { this.snStatus = snStatus; this.lotNo = lotNo; } + + public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) { + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.vendorNo = vendorNo; + } }