1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读

2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口

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

@@ -31,9 +31,9 @@ public class MesPpDetails extends BaseBean{
 
     private static final long serialVersionUID = 9214639813072592727L;
 
-    @Column(name="WROKORDER_NO")
+    @Column(name="WORK_ORDER_NO")
     @ApiParam("工单号")
-    private String woekorderNo;
+    private String workOrderNo;
 
     @Column(name="ITEM")
     @ApiParam("行号")

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

@@ -33,10 +33,10 @@ public class MesPpMaster extends BaseBean{
 
     private static final long serialVersionUID = 9214639813072592726L;
 
-    @Column(name="WROKORDER_NO")
+    @Column(name="WORK_ORDER_NO")
     @ApiParam("工单号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-    private String woekorderNo;
+    private String workOrderNo;
 
     @Column(name="PDLINE_NO")
     @ApiParam("产线代码")
@@ -95,7 +95,7 @@ public class MesPpMaster extends BaseBean{
     private String remark;
 
     @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10")
-    @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭")
+    @ApiParam("工单计划状态")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS")
     private Integer workOrderPlanStatus;
 

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

@@ -22,7 +22,7 @@ public class MesPpTemplate extends BaseBean {
 
     @ApiParam(value = "工单号")
     @AnnoOutputColumn
-    private String woekorderNo;
+    private String workOrderNo;
 
     @ApiParam(value = "产线代码")
     @AnnoOutputColumn

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

@@ -143,7 +143,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_GROUP")
     @ApiParam(value = "物料组")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
             isMultiple = 1, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
     private String partGroup;
 

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

@@ -31,9 +31,9 @@ public class WmsPullTaskDetails extends BaseBean{
 
     private static final long serialVersionUID = 9214639813072592736L;
 
-    @Column(name="WROKORDER_NO")
+    @Column(name="WORK_ORDER_NO")
     @ApiParam("工单号")
-    private String woekorderNo;
+    private String workOrderNo;
 
     @Column(name="ITEM")
     @ApiParam(value = "行号", example = "0")

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

@@ -32,10 +32,10 @@ public class WmsPullTaskMaster extends BaseBean{
 
     private static final long serialVersionUID = 9214639813072592736L;
 
-    @Column(name="WROKORDER_NO")
+    @Column(name="WORK_ORDER_NO")
     @ApiParam("工单号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String woekorderNo;
+    private String workOrderNo;
 
     @Column(name="PDLINE_NO")
     @ApiParam("产线代码")

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

@@ -2862,7 +2862,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getStringLikerPack(mesPpMaster.getWorkOrderNo(), "workOrderNo", result);
         DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result);
         DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result);
@@ -2883,7 +2883,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result);
-        DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getStringEqualPack(mesPpDetails.getWorkOrderNo(), "workOrderNo", result);
 
         getStringBuilderPack(mesPpDetails, result);
 
@@ -2910,7 +2910,7 @@ public class WmsHqlPack {
         }
 
         DdlPreparedPack.getInPackList(integerList, "orderStatus", result);
-        DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWorkOrderNo(), "workOrderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
         DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
         DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result);
@@ -2928,7 +2928,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWorkOrderNo(), "workOrderNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsPullTaskDetails, result);