From f981047fb45f5c31411773ab283b9c6d2d015ecc Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 16 Apr 2019 18:13:04 +0800 Subject: [PATCH 1/6] =?UTF-8?q?MES=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 8 ++ .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 86 ++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 114 +++++++++++++++++++++ 3 files changed, 208 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index ecc4ebc..f2efe75 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -63,4 +63,12 @@ public class MesPart extends BaseBean { @Column(name="PACK_SPEC_CODE") @ApiParam("包装规格代码") private String packSpecCode; + + @Column(name="DEFAULT_WORK_CENTER") + @ApiParam("默认工作中心") + private String defaultWorkCenter; + + @Column(name="PRODUCE_CATEGORY") + @ApiParam("产品类型") + private String produceCategory; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java new file mode 100644 index 0000000..521cd5f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PLAN_ORDER") +@Api("生产主计划") +public class MesPlanOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("生产计划单号") + private String orderNo; + + @Column(name="ORDER_TYPE") + @ApiParam("计划类型") + private Integer orderType; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name="DECOMPOSE_QTY") + @ApiParam("分解数量") + private Double decomposeQty; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="START_TIME") + @ApiParam("计划开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("计划结束时间") + private String endTime; + + @Column(name="DELIVERY_DATE") + @ApiParam("交货日期") + private String deliveryDate; + + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name="SOURCE") + @ApiParam("计划来源") + private String source; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java new file mode 100644 index 0000000..58e2808 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -0,0 +1,114 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PLAN_ORDER") +@Api("生产工单") +public class MesWorkOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private Integer partNo; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name="REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name="SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name="SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name="WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name="WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name="NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name="PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户禅产线代码") + private String custProdLineCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name="WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; +} From ab124f2c29dd60dc82a3ccd9791ffb21260e1eaf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 16 Apr 2019 20:28:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?MES=E4=B8=9A=E5=8A=A1Bean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 58 +++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 45 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 45 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 3 +- .../i3plus/pojo/mes/bean/MesProdCfgDetail.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 5 +- 7 files changed, 225 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java 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 new file mode 100644 index 0000000..33f42cd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_DEFECT_RECORD") +@Api("生产工单") +public class MesDefectRecord extends BaseBean { + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("物料号") + private Integer partNo; + + @Column(name="DEFECT_CODE") + @ApiParam("不良代码") + private String defectCode; + + @Column(name="REPAIR_STATUS") + @ApiParam("维修状态") + private Double repairStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private Double workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private Double workCellCode; + + @Column(name="MEMO") + @ApiParam("备注") + private Double memo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java new file mode 100644 index 0000000..a0da095 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_KEY_DATA") +@Api("设备关键数据") +public class MesKeyData extends BaseBean { + @Column(name="KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name="KEY_DATA_NAME") + @ApiParam("关键数据名称") + private Integer keyDataName; + + @Column(name="UPPER_LIMIT") + @ApiParam("数据上限") + private Double upperLimit; + + @Column(name="LOWER_LIMIT") + @ApiParam("数据下限") + private Double lowerLimit; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java new file mode 100644 index 0000000..f1bca85 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_KPSN_RULE") +@Api("关键件条码校验规则") +public class MesKpsnRule extends BaseBean { + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="LENGTH") + @ApiParam("长度") + private Integer length; + + @Column(name="FROM1") + @ApiParam("起始1") + private Integer from1; + + @Column(name="TO1") + @ApiParam("至1") + private Integer to1; + + @Column(name="FIX1") + @ApiParam("内容1") + private String fix1; + + @Column(name="FROM2") + @ApiParam("起始2") + private Integer from2; + + @Column(name="TO2") + @ApiParam("至2") + private Integer to2; + + @Column(name="FIX2") + @ApiParam("内容2") + private String fix2; + + @Column(name="TYPE") + @ApiParam("类型") + private String type; + + @Column(name="BIND_RULE") + @ApiParam("绑定规则") + private Integer bandRule; + + @Column(name="SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java new file mode 100644 index 0000000..8097a97 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PART_SCHEDULE_BOM") +@Api("生产排程清单") +public class MesPartScheduleBom extends BaseBean { + @Column(name="PART_NO") + @ApiParam("排程物料号") + private String partNo; + + @Column(name="ITEM_PART_NO") + @ApiParam("关联物料号") + private Integer itemPartNo; + + @Column(name="ITEM_QTY") + @ApiParam("用量") + private String itemQty; + + @Column(name="SCHEDULE_TYPE") + @ApiParam("排程类型") + private Double scheduleType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 521cd5f..6b904e0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -11,12 +11,11 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.util.Date; /** * @Description: * @Reference: - * @Author: + * @Author: Crish * @CreateDate:2019-04-16-17:36 * @Modify: **/ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index b0b4829..cc76c0c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -37,6 +37,6 @@ public class MesProdCfgDetail extends BaseBean { private String partNo; @Column(name="IS_VIRTUAL") - @ApiParam("产品配置类型代码") + @ApiParam("是否虚零件") private Integer isVirtual; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 58e2808..fd29d30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -11,12 +11,11 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.util.Date; /** * @Description: * @Reference: - * @Author: + * @Author: Crish * @CreateDate:2019-04-16-17:36 * @Modify: **/ @@ -25,7 +24,7 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_PLAN_ORDER") +@Table(name="MES_WORK_ORDER") @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name="ORDER_NO") From 13106615eee91d912f04bea376bbfd1d7330e5e1 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 17 Apr 2019 11:56:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?PO=E6=98=8E=E7=BB=86=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=94=B9=E4=B8=BADouble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- 1 file changed, 1 insertion(+), 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 9d973a8..1fc9671 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 @@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "SNP") @ApiParam("标准包装") - public Integer snp; + public Double snp; /** * 是否免费:0=计费,1=免费 From fc6368ca5f0a6c62f409a14dfae9cdf8f9cfcf7a Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 17 Apr 2019 13:49:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 59 +++++++++++----------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 2fef73f..1c0d26e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -136,18 +136,19 @@ public class WmsHqlPack { * @param wmsDocMovementMaster * @return */ - public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { + DdlPackBean packBean = new DdlPackBean(); +// StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); - getStringBuilderPack(wmsDocMovementMaster, result); + getStringBuilderPack(wmsDocMovementMaster, packBean); - return result.toString(); + return packBean; } /** @@ -984,28 +985,28 @@ public class WmsHqlPack { * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); - - getStringBuilderPack(wmsMoveDetails, result); + public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { + DdlPackBean packBean = new DdlPackBean(); +// StringBuffer result = new StringBuffer(); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean); + DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean); + + getStringBuilderPack(wmsMoveDetails, packBean); - return result.toString(); + return packBean; } /** From 5d5291096053960c81caafd49feafb7aa1ff8c5b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 17 Apr 2019 13:50:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E2=80=9C=E6=98=AF=E5=90=A6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E2=80=9D=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index fdbeed4..bd4c822 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -115,10 +115,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "是否散件", example = "1") private Integer isPart; - @Column(name = "IS_SN") - @ApiParam(value = "是否指定条码", example = "1") - private Integer isSn; - @Transient @ApiParam(value = "发运单号") private String shipOrderNo; From 3675175bf16cbd69cca766eb218b03fd4ee80cac Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 17 Apr 2019 13:57:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?MES=E9=A1=B9=E7=9B=AEpojo=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 106 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 61 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 61 ++++++++++++ 3 files changed, 228 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java 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 new file mode 100644 index 0000000..6c4e672 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PRODUCE_SN") +@Api("产品条码表") +public class MesProduceSn extends BaseBean { + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name="SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name="PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name="IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name="OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name="WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name="CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name="CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name="PACKAGE_SN") + @ApiParam("包装条码") + private String packageSn; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java new file mode 100644 index 0000000..6370818 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QUEUE_ORDER") +@Api("生产队列主表") +public class MesQueueOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name="VIN_CODE") + @ApiParam("Vin") + private Integer vinCode; + + @Column(name="CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name="SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name="WORK_ORDER_NO") + @ApiParam("生产工单号") + private Double workOrderNo; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private Double custProdLineCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private Double areaCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java new file mode 100644 index 0000000..f4c182e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QUEUE_ORDER_DETAIL") +@Api("生产队列明细") +public class MesQueueOrderDetail extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private Integer partNo; + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="DETAIL_SEQ") + @ApiParam("队列明细序号") + private Double detailSeq; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="WORK_TYPE") + @ApiParam("生产类型") + private Double workType; + + @Column(name="PRODUCE_CATEGORY") + @ApiParam("产品类型") + private Double produceCategory; +}