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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -242,6 +242,16 @@ public class DdlPreparedPack {
      * @param columnName 列名
      * @param packBean
      */
+    public static void getStringNotNullPack(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(null," and model." + columnName + " is not null", null);
+    }
+
+    /**
+     * 封装String对象成equal语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
     public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
             packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val);

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -178,4 +179,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Column(name = "REF_NO")
     @ApiParam(value = "合同号")
     private String refNo;
+
+    @Transient
+    @ApiParam(value = "关联单号")
+    private String refOrderNo;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.sweb.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 订单批量新增输入模型
@@ -34,6 +36,12 @@ public class SwebPOBatchInsertEnterModel extends BaseBean {
     @ApiParam(value = "合同号")
     private String refNo;
 
+    @ApiParam(value = "是否导入使用")
+    private boolean isImport;
+
+    @ApiParam(value = "订单主表对应日期缓存")
+    private Map<String,SwebPurchaseOrder> dayOrderCache;
+
     @ApiParam(value = "零件列表")
     private List<SwebPOBatchInsertItemEnterModel> partItems;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java

@@ -34,6 +34,10 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
     @Column(name = "VENDOR_NAME")
     private String vendorName;
 
+    @Column(name = "REF_NO")
+    @ApiParam(value = "合同号")
+    private String refNo;
+
     @Column(name = "PART_NAME")
     @ApiParam(value = "零件名称")
     private String partName;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -241,6 +241,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
+        HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
 
         getStringBuilderPack(wmsPart, result);
 
@@ -1021,13 +1022,36 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
-
+        HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
         getStringBuilderPack(wmsMoveSn, result);
 
         return result.toString();
     }
 
     /**
+     * 针对质检查询库存移动条码条件封装
+     *
+     * @param sn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsMoveSnForQC(List<String> orderList, String sn, String organizeCode) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(sn, "sn", result);
+        DdlPreparedPack.getInPackList(orderList, "orderNo", result);
+        DdlPreparedPack.getStringNotNullPack("remark", result);
+
+        // 判断工厂代码是否为空
+        if (StringUtils.isNotBlank(organizeCode)) {
+            DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
+        }
+
+        // 封装有效状态和删除状态
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
      * 质检单信息 查询条件封装
      *
      * @param wmsQCMaster