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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -478,4 +478,16 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * ANDON_ 安灯PLC控制
+     * @param plc
+     * @return
+     */
+    public static DdlPackBean packAndonPLC(AndonPLC plc) {
+        DdlPackBean result = new DdlPackBean();
+        getStringBuilderPack(plc, result);
+
+        return result;
+    }
 }

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

@@ -85,4 +85,20 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     @ApiParam(value = "发货日期")
     private String sendDate;
+
+    @Transient
+    @ApiParam(value = "工厂名称")
+    public String organizeName;
+
+    @Transient
+    @ApiParam("联系人")
+    private String vendorOwner;
+
+    @Transient
+    @ApiParam("邮箱")
+    private String vendorEmail;
+
+    @Transient
+    @ApiParam("供应商名称")
+    private String vendorName;
 }

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

@@ -120,5 +120,21 @@ public class WmsASNMasterDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public int lockVersion;
+    public transient int lockVersion;
+
+    @Transient
+    @ApiParam("实收数量")
+    private Double rcQty;
+
+    @Transient
+    @ApiParam("ASN条码总箱数")
+    public Integer totalBoxes;
+
+    @Transient
+    @ApiParam("差异")
+    public Double difference;
+
+    @Transient
+    @ApiParam("标准包装")
+    public Double snp;
 }

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

@@ -197,5 +197,5 @@ public class WmsDocMovementDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public int lockVersion;
+    public transient int lockVersion;
 }

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

@@ -107,4 +107,16 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "IS_SN")
     @ApiParam(value = "是否生成条码", example = "1")
     public Integer isSn;
+
+    @Transient
+    @ApiParam(value = "工厂名称")
+    public String organizeName;
+
+    @Transient
+    @ApiParam("联系人")
+    private String vendorOwner;
+
+    @Transient
+    @ApiParam("邮箱")
+    private String vendorEmail;
 }

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

@@ -141,5 +141,14 @@ public class WmsPOMasterDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public int lockVersion;
+    public transient int lockVersion;
+
+    @Transient
+    @ApiParam("PO条码总箱数")
+    public Integer totalBoxes;
+
+    @Transient
+    @ApiParam("差异")
+    public Double difference;
+
 }

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

@@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public int lockVersion;
+    public transient int lockVersion;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
+
+public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
+}

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

@@ -1394,8 +1394,9 @@ public class WmsHqlPack {
      * @param groupDataAuth
      * @return
      */
-    public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc) {
+    public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
+        int i = 1;
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
@@ -1430,8 +1431,14 @@ public class WmsHqlPack {
                 }
             }
         }
+
+        String hqlString = " and ( 1=1 " +  result.getPackedHql() + ") ";
+
+        result.setWhereAppend(hqlString);
         // 通用数据拼接
-        getStringBuilderPack(new WmsDataAuth(), result);
+        WmsDataAuth wmsDataAuth = new WmsDataAuth();
+        wmsDataAuth.setOrganizeCode(organizeCode);
+        getStringBuilderPack(wmsDataAuth, result);
         return result;
     }
 
@@ -1701,4 +1708,18 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTaskSrc, result);
         return result;
     }
+    /**
+     * 供应商零件 分页查询
+     *
+     * @param wmsVendorPart
+     * @return
+     */
+    public static DdlPackBean packHqlWmsVendorPart(WmsVendorPart wmsVendorPart) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsVendorPart.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsVendorPart.getPartNo(), "partNo", result);
+        getStringBuilderPack(wmsVendorPart, result);
+        return result;
+    }
 }