Merge branch 'ext-dev' of shun.cui/i3plus-pojo into ext-dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java

@@ -21,6 +21,9 @@ public class ProcessScrapRate {
     @ApiParam("工序")
     private String processCode;
 
+    @ApiParam("工序名称")
+    private String processName;
+
     @ApiParam("项目号")
     private String prodCfgTypeCode;
 
@@ -31,8 +34,9 @@ public class ProcessScrapRate {
     private BigDecimal scrapRate;
 
 
-    public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) {
+    public ProcessScrapRate(String processCode,String processName, String prodCfgTypeCode, String workCellCode) {
         this.processCode = processCode;
+        this.processName = processName;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.workCellCode = workCellCode;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2206,7 +2206,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) {
-            DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean);
+            DdlPreparedPack.getStringEqualPack(defectRecord.getSerialNumber(), "serialNumber", packBean);
         }
         if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean);
@@ -2218,7 +2218,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean);
         }
         if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getProductSn())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean);
         }
         if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
             DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -304,6 +304,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer limitQualityDays;
 
+    @Column(name = "WEIGHT")
+    @ApiParam(value = "重量", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double weight ;
+
 
     public int getIqcVal() {
         return this.iqc == null ? 0 : this.iqc.intValue();
@@ -320,6 +325,7 @@ public class WmsPart extends BaseBean {
         return partVol == null ? 0 : partVol;
     }
 
+    public Double getWeightVal() { return this.weight == null ? 0d : this.weight.doubleValue(); }
 
     public Double getQty() {
         return qty == null ? 0 : qty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java

@@ -111,6 +111,9 @@ public class WmsGcdcContainerModel extends BaseBean {
     @ApiParam(value = "是否绑定发运")
     private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     public WmsGcdcContainerModel() {
     }
 
@@ -126,10 +129,11 @@ public class WmsGcdcContainerModel extends BaseBean {
         this.createUser = createUser;
     }
 
-    public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo,
+    public WmsGcdcContainerModel(Long id, String orderNo,String transTypeCode, String moveNo, String erpSrcNo, String custNo,
                                  Integer itemStatus, String createDatetime, String createUser, Integer busiType) {
         this.id = id;
         this.orderNo = orderNo;
+        this.transTypeCode = transTypeCode;
         this.moveNo = moveNo;
         this.erpSrcNo = erpSrcNo;
         this.custNo = custNo;