Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java

@@ -7,22 +7,26 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.List;
 
 /**
-* @Description : 作业流程Model
-* @Reference :
-* @Author : dragon.xu
-* @CreateDate : 2019-04-29 15:39
-* @Modify: 
-**/
+ * @Description : 作业流程Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-04-29 15:39
+ * @Modify:
+ **/
 @Data
 @Api("作业流程Model")
 public class WmsActionGroupModel implements Serializable {
     @ApiParam("流程")
-    public WmsActionGroup wmsActionGroup;
-
+    public String agId;
+    @ApiParam("工厂代码")
+    public String organizeCode;
+    @ApiParam("GOJS位置")
+    public String position;
     @ApiParam("流程明细Model集合")
     public List<WmsActionGroupDetailsModel> wmsActionGroupDetailsModelList;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -126,4 +126,17 @@ public class SwebHqlPack {
         DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
         return buildHql(details, result);
     }
+
+    /**
+     * 将该供应商下该单号状态全部改为已发布状态 where sql
+     * @param details
+     * @return
+     */
+    public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
+        return buildHql(details, result);
+    }
 }