Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java

@@ -51,12 +51,12 @@ public class CustomFieldConstant {
     public static final String SFC_DATA_LOCATION = "LOCATION";
 
     //**************************************************************************************
-    public static final String ITEM_ACCESSORY_TYPE = "ACCESSORY_TYPE";
+    public static final String ITEM_ACCESSORY_TYPE = "ACCESSORY_TYPE";//辅料类型
     public static final String ITEM_WEIGHT = "MAT_WEIGHT";
-    public static final String ITEM_MAT_SPEC = "MAT_SPEC";
-    public static final String ITEM_MODEL = "MODEL";
-    public static final String ITEM_TEXTURE = "TEXTURE";
-    public static final String ITEM_DRAWING = "DRAWING";
-    public static final String ITEM_DRAWING_REVISION = "DRAWING_REVISION";
+    public static final String ITEM_MAT_SPEC = "MAT_SPEC";//规格
+    public static final String ITEM_MODEL = "MODEL";//型号
+    public static final String ITEM_TEXTURE = "TEXTURE";//材质
+    public static final String ITEM_DRAWING = "DRAWING";//图号
+    public static final String ITEM_DRAWING_REVISION = "DRAWING_REVISION";//图号版本
 }
 

common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java

@@ -512,4 +512,23 @@ public class ZprodordconfStruOut  implements java.io.Serializable {
             _javaType, _xmlType, typeDesc);
     }
 
+    @Override
+    public String toString() {
+        return "ZprodordconfStruOut{" +
+                "aufnr='" + aufnr + '\'' +
+                ", vornr='" + vornr + '\'' +
+                ", aueru='" + aueru + '\'' +
+                ", lmnga=" + lmnga +
+                ", ism01=" + ism01 +
+                ", ism02=" + ism02 +
+                ", ism03=" + ism03 +
+                ", ism04=" + ism04 +
+                ", ism05=" + ism05 +
+                ", ism06=" + ism06 +
+                ", ret='" + ret + '\'' +
+                ", msg='" + msg + '\'' +
+                ", __equalsCalc=" + __equalsCalc +
+                ", __hashCodeCalc=" + __hashCodeCalc +
+                '}';
+    }
 }

console/src/main/resources/application-prd.yml

@@ -28,10 +28,10 @@ activemq:
 #WebService
 ws:
   erp:
-    server: 172.16.251.223
+    server: srm.mesnac.com
     port: 8000
-    user: mesd001
-    pwd: a123456
+    user: mes001
+    pwd: mesprd
     valid: N
 
 #ftp

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java

@@ -473,7 +473,7 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
                     int sizeLength = size.length;
                     BigDecimal length =  new BigDecimal(size[sizeLength-1]);
                     BigDecimal width =  new BigDecimal(size[sizeLength-2]);
-                    BigDecimal sizeReqQty = length.multiply(width).multiply(reqQty);
+                    BigDecimal sizeReqQty = length.multiply(width).multiply(reqQty).divide(new BigDecimal(1000000));
                     callItem.setSizeReqQty(sizeReqQty);
 
                     //按物料汇总需求数量
@@ -490,7 +490,7 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
                 if (size != null && size.length >= 1) {
                     int sizeLength = size.length;
                     BigDecimal length =  new BigDecimal(size[sizeLength-1]);
-                    BigDecimal sizeReqQty = length.multiply(reqQty);
+                    BigDecimal sizeReqQty = length.multiply(reqQty).divide(new BigDecimal(1000));
                     callItem.setSizeReqQty(sizeReqQty);
 
                     //按物料汇总需求数量

production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java

@@ -326,7 +326,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             //更改派工单状态
             sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour);
             //报工
-            //sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
+            sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
         } catch (Exception e) {
             ExceptionUtil.throwException(e);
         }
@@ -487,8 +487,8 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             log.setIntegrationWay("ERP");
             log.setIntegrationMethod("erpWebService.zmesProdordconf");
             log.setParam(Arrays.toString(ins));
-            log.setStatus(outHolder.value[1].getRet());
-            log.setResultMessage(outHolder.value[1].getMsg());
+            log.setStatus("");
+            log.setResultMessage(Arrays.toString(outHolder.value));
             log.setTransactionId("");
             log.setRequestDateTime(LocalDateTime.now());
             log.setCreatedDateTime(LocalDateTime.now());