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

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

@@ -161,6 +161,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean);
+        }
         if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 生产领料计划
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2020-09-10 19:50
+ * @Modify:
+ **/
+@Data
+public class MesPPMasterModel {
+
+    @ApiParam("生产计划主数据")
+    private MesPpMaster mesPpMaster;
+
+    @ApiParam("生产计划明细数据")
+    private List<MesPpDetails> mesPpDetailsList;
+}