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

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

@@ -16,7 +16,7 @@ import java.io.Serializable;
 
 /**
  * @author dominic
- * @date 2020/11/18 21:52
+ * @date 2020/11/19 00:47
  * @desc 包装明细
  */
 @Data
@@ -45,5 +45,4 @@ public class PackageDetailModel {
     public PackageDetailModel() {
     }
 
-    ;
 }

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

@@ -2783,8 +2783,8 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode);
+    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }

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

@@ -1753,7 +1753,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
+        //DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
         /*DdlPreparedPack.getOrderByPack(