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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -21,7 +21,8 @@ public class MesPcnEnumUtil {
         REVEAL_MODULE(20, "展示组件"),
         BUTTON_MODULE(30, "按钮组件"),
         TIMING_MODULE(40, "定时组件"),
-        PCS_BACK_MODULE(50, "工序后台组件");
+        PCS_BACK_MODULE(50, "工序后台组件"),
+        PLC_CALLBACK_MODULE(60, "PLC回调工位参数");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java

@@ -138,6 +138,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址")
     private Integer dataDirect;
 
+    @Column(name = "CALLBACK_METHOD")
+    @ApiParam("回调方法名称")
+    private String callbackMethod;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java

@@ -124,4 +124,8 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("本批次生产总数")
+    private Double locSrcLotNoQty;
+
 }

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

@@ -22,6 +22,10 @@ public class StepDispatchModel {
 
     private String moduleDataMapKey;
 
+    private String pfKey;
+
+    private String dlKey;
+
     private String scanInfo;
 
     public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {