From 746a17bd7539a670f75789981fc7f3fd5535f435 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 2 Sep 2020 18:26:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bj-mgn=E8=BE=85=E5=8A=A9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 ++++ .../i3plus/pojo/mes/model/AssistModuleModel.java | 25 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/GenSerialNoModel.java | 3 +++ 3 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 3f2bef5..571dd6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -74,6 +74,10 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("目标合格率") private Double targetPassRate; + @Column(name = "STAND_TAKT") + @ApiParam("标准节拍") + private Integer standTakt; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java new file mode 100644 index 0000000..166c188 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/2 5:00 下午 + * @Modify: + */ +@Data +public class AssistModuleModel { + + @ApiParam("标准节拍") + private Integer standTakt; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("y坐标内容") + private List yAxis; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index c130f5b..7cbd75b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -88,6 +88,9 @@ public class GenSerialNoModel { @ApiParam("零件号后4位") private String partNoAfterFour; + @ApiParam("客户工厂代码") + private String custProdLineCode; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; From c06c504805eed75abe75a96ac1928e596d86851a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 2 Sep 2020 18:28:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=902712=20=E5=AD=90=2009=201.2.1.1.1?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=8F=91=E8=BF=90=E8=BD=A6=E8=BE=86=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=20/=2009=201.2.1.1.1=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E8=BD=A6=E8=BE=86=E6=8E=A8=E8=8D=90=20-=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 10 ++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 21 +++++++++-- .../pojo/wms/modelbean/WmsRecommendCarModel.java | 42 ++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index fa3d7d1..0e99f0f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -84,4 +85,13 @@ public class WmsCar extends BaseBean { @ApiParam("经纬度") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; + + @Column(name = "VOLUME", columnDefinition = "decimal(18,8)") + @ApiParam(value = "容积", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double volume; + + @ApiParam(value = "需要(辆)") + @Transient + private Integer carQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index b0dd8a0..431ec97 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -400,7 +400,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("产线代码") private String workCenterCode; - + @Transient + @ApiParam("箱数") + private Double boxQty; public WmsDocMovementDetails () { @@ -420,8 +422,7 @@ public class WmsDocMovementDetails extends BaseBean { this.priority = priority; this.orderNo = orderNo; } - - public WmsDocMovementDetails (String partNo,String orderNo) { +public WmsDocMovementDetails (String partNo,String orderNo) { this.partNo = partNo; this.orderNo = orderNo; } @@ -504,4 +505,18 @@ public class WmsDocMovementDetails extends BaseBean { this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); this.color = color; } + + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) { + this.id = wmsDocMovementDetails.getId(); + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.qty = wmsDocMovementDetails.getQty(); + this.unit = wmsDocMovementDetails.getUnit(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.createDatetime = wmsDocMovementDetails.getCreateDatetime(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.boxQty = boxQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java new file mode 100644 index 0000000..f82779d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 推荐车辆信息model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-02 11:17 + * @Modify: + **/ +@Data +@Api("推荐车辆信息model") +public class WmsRecommendCarModel extends BaseBean implements Serializable { + + @ApiParam(value = "计划日期") + String planTimeStart; + @ApiParam(value = "待发物料总数") + String partNo; + @ApiParam(value = "标准包装") + String snp; + @ApiParam(value = "单包装体积(m3)") + Double vol; + @ApiParam(value = "物料体积(m3)") + Double partTotalVol; + +// @ApiParam(value = "车辆编号") +// String carNo; +// @ApiParam(value = "车辆名称") +// String carDesc; +// @ApiParam(value = "容积(m3)") +// Double volume; +// @ApiParam(value = "需要(辆)") +// Integer carQty; + + +} From 1e5fe4270258ec8dcf75a52aa04b748571f7c2b0 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 3 Sep 2020 01:54:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A8=E6=A3=80=E5=BD=95=E5=85=A5=E4=B8=8D?= =?UTF-8?q?=E8=89=AF=E6=95=B0=E9=87=8F=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsQCSNErrorList.java | 51 ++++++++++++++-------- .../wms/repository/WmsQCSNErrorListRepository.java | 16 +++++++ 2 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java index 9f2e2b3..4d54afc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,66 +27,80 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_SN_ERROR_LIST") +@Table(name="WMS_QC_SN_ERROR_LIST", + indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN") +}) @Api("质检单条码质检不良清单表") public class WmsQCSNErrorList extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; - private static final long serialVersionUID = 7779401323803118985L; @Column(name="ORDER_NO") @ApiParam("单号") - public String orderNo; + private String orderNo; @Column(name="ITEM") @ApiParam("行号") - public String item; + private String item; /** - * 状态:1=创建,10=已处理 + * 状态:10=创建,20=已处理 */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer itemStatus; + private Integer itemStatus; @Column(name="REMARK") @ApiParam("备注") - public String remark; + private String remark; - @Column(name="PASS_QTY", nullable = false) - @ApiParam("合格数量") + @Column(name="SAMPLE_QTY", nullable = false) + @ApiParam("检验数量") @ColumnDefault("0") - public double passQty; + private double sampleQty; @Column(name="REJECT_QTY", nullable = false) @ApiParam("不合格数量") @ColumnDefault("0") - public double rejectQty; + private double rejectQty; @Column(name="UNIT") @ApiParam("单位") - public String unit; + private String unit; @Column(name="PART_NO") @ApiParam("物料编码") - public String partNo; + private String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") - public String partNameRdd; + private String partNameRdd; @Column(name="SN") @ApiParam("条码") - public String sn; + private String sn; @Column(name = "QC_USER") @ApiParam("检验员") - public String qcUser; + private String qcUser; @Column(name = "QC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") - public String qcTime; + private String qcTime; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") - public String vendorNo; + private String vendorNo; + + @Column(name = "ERROR_CODE") + @ApiParam("不良代码") + private String errorCode; + + @Column(name = "ERROR_DESC_RDD") + @ApiParam("不良描述") + private String errorDescRdd; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java new file mode 100644 index 0000000..8fe97a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCSNErrorList; +import org.springframework.stereotype.Repository; + +/** + * @Description : 质检单条码不良操作类 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-02 21:06 + * @Modify: + **/ +@Repository +public interface WmsQCSNErrorListRepository extends BaseRepository { +}