Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java

@@ -1,6 +1,5 @@
 package com.foreverwin.mesnac.common.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.foreverwin.mesnac.common.model.ExcelColumn;
 
 import java.io.Serializable;
@@ -104,7 +103,7 @@ public class SfcDispatchDto implements Serializable{
     /**
      * 工时
      */
-    private Double prodHours;
+    private BigDecimal prodHours;
     /**
      * 总计划开始时间
      */
@@ -405,11 +404,11 @@ public class SfcDispatchDto implements Serializable{
         this.dispatchQty = dispatchQty;
     }
 
-    public Double getProdHours() {
+    public BigDecimal getProdHours() {
         return prodHours;
     }
 
-    public void setProdHours(Double prodHours) {
+    public void setProdHours(BigDecimal prodHours) {
         this.prodHours = prodHours;
     }
 

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -778,8 +778,8 @@
                           SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
                           CC.VALUE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER
             ) WIP
-            LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
-            LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ
+            LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND VI.ROUTER_BO = WIP.ROUTER_BO AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
+            LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.ROUTER_BO = WIP.ROUTER_BO AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ
         ) WIP
         <if test="isCompleted != null and isCompleted != ''">
             WHERE WIP.IS_COMPLETED = #{isCompleted}

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

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant;
+import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn;
@@ -341,7 +342,10 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             sfcDispatchCommonService.updateSfcDispatchStatus(site, CommonMethods.getUser(), dispatchNo, DispatchStatusEnum.COMPLETE.getCode(),workHour);
             //报工
             if (enabled){
-                sendErp(sfc, stepId, qty, BigDecimal.ZERO, workHour);
+                SfcDispatchDto sfcdispatch = new SfcDispatchDto();
+                sfcdispatch.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo));
+                sfcdispatch = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatch);
+                sendErp(sfc, stepId, qty, BigDecimal.ZERO, sfcdispatch.getProdHours());
             }
         } catch (Exception e) {
             ExceptionUtil.throwException(e);