Merge remote-tracking branch 'origin/master'

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);
         }