Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java

@@ -92,6 +92,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     private Integer minGenLot;
 
     @Transient
+    @ApiParam("已下达箱数")
+    private Integer alreadyLandedNum;
+
+    @Transient
     @ApiParam("物料名称")
     private String partName;
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnPaintPolishingReportModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料描述")
+    private String partDesc;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("日期")
+    private String modifyDate;
+
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+
+    @ApiParam("抛光数量")
+    private Double polishingQty;
+
+    @ApiParam("返喷标识")
+    private String reverseSprayMark;
+
+    @ApiParam("打磨件物料号")
+    private String polishPartNo;
+
+    @ApiParam("打磨件物料描述")
+    private String polishPartDesc;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -3415,6 +3416,18 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode());
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
+            DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
+                    "modifyDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
     public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) {
         DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean);

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

@@ -221,6 +221,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double proportion;
 
+    @Column(name = "STD_CHECK_TIME")
+    @ApiParam(value = "标准质检时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer stdCheckTime;
+
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE")

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

@@ -226,10 +226,12 @@ public class WmsStockQuan extends BaseBean {
         return this.boxQty == null ? 0 : this.boxQty;
     }
 
+
     public Integer getLockVersion() {
         return this.lockVersion == null ? 0 : this.lockVersion;
     }
 
+
     public WmsStockQuan() {
     }