拆分

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -71,6 +71,19 @@ public class AbnormalBillController {
         return R.ok(result);
     }
 
+    /**
+     * 拆分弹出框
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("getQCAbnormal")
+    public R getQCAbnormal(){
+        List<AbnormalBill> result;
+        result = abnormalBillService.getQCAbnormal();
+        return R.ok(result);
+    }
+
     /**
      * 分页查询数据
      *

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java

@@ -35,4 +35,6 @@ public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
     Integer findAbnormalMethodBySFC(@Param("site")String site,@Param("sfc")String sfc);
 
     List<ScrapDto> findScrapDtoBySfc(@Param("site")String site, @Param("sfc")String sfc);
+
+    List<AbnormalBill> getQCAbnormalList(@Param("site") String site);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java

@@ -134,4 +134,5 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      */
     String formatMessage(AbnormalBill abnormalBill,String messageType, String site);
 
+    List<AbnormalBill> getQCAbnormal();
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -1023,9 +1023,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         return StringUtils.format(body, messageMap);
     }
 
-
-
-
+    @Override
+    public List<AbnormalBill> getQCAbnormal() {
+        return abnormalBillMapper.getQCAbnormalList(CommonMethods.getSite());
+    }
 
 
     @Override

anomaly/src/main/resources/mapper/AbnormalBillMapper.xml

@@ -1013,4 +1013,10 @@
         </where>
     </select>
 
+    <select id="getQCAbnormalList" resultMap="BaseResultMap">
+        SELECT * FROM Z_ABNORMAL_BILL zab
+      	JOIN sfc s ON zab.SITE=s.SITE AND zab.SFC=s.SFC
+      	JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO= ZAB.HANDLE
+      	WHERE zab.SITE=#{site} AND zab.STATUS='G' AND zab."TYPE"='Z'   AND s.QTY>1 AND (ZABD.ABNORMAL_METHOD='F' OR  ZABD.ABNORMAL_METHOD='C')   AND ZABD.ROUTER_BO IS NOT NULL
+    </select>
 </mapper>

meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/SfcDto.java

@@ -14,12 +14,21 @@ public class SfcDto extends Sfc {
     private String resrce;
     private String workCenter;
     private String dispatchNo;
+    private String abnormalNo;
     private String stepId;
     private String plannedStartDate;
     private String plannedCompDate;
     //工作令号
     private String workOrder;
 
+    public String getAbnormalNo() {
+        return abnormalNo;
+    }
+
+    public void setAbnormalNo(String abnormalNo) {
+        this.abnormalNo = abnormalNo;
+    }
+
     public String getWorkOrder() {
         return workOrder;
     }

production/src/main/java/com/foreverwin/mesnac/production/dto/SplitSfcDto.java

@@ -6,6 +6,15 @@ public class SplitSfcDto extends SplitSfc {
     private String ncCode;
     private String routerBo;
     private String ncQty;
+    private String abnormalNo;
+
+    public String getAbnormalNo() {
+        return abnormalNo;
+    }
+
+    public void setAbnormalNo(String abnormalNo) {
+        this.abnormalNo = abnormalNo;
+    }
 
     public String getNcCode() {
         return ncCode;

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

@@ -8,6 +8,8 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
 import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.dto.SfcDto;
+import com.foreverwin.mesnac.meapi.model.Router;
+import com.foreverwin.mesnac.meapi.service.RouterService;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
 import com.foreverwin.mesnac.production.dto.SplitSfcDto;
 import com.foreverwin.mesnac.production.mapper.SplitSfcMapper;
@@ -50,6 +52,8 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
     private SfcDispatchCommonService sfcDispatchCommonService;
     @Autowired
     private ShopOrderService shopOrderService;
+    @Autowired
+    private RouterService routerService;
     @Override
     public IPage<SplitSfc> selectPage(FrontPage<SplitSfc> frontPage, SplitSfc splitSfc) {
         QueryWrapper<SplitSfc> queryWrapper = new QueryWrapper<>();
@@ -80,6 +84,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
             throw new BaseException("未找到方案确认的质量异常");
         }
         sfcData.setQty(Double.valueOf(sfcDto.getNcQty()));
+        sfcData.setAbnormalNo(sfcDto.getAbnormalNo());
         return sfcData;
     }
     @Override
@@ -133,6 +138,8 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
             splitSfc.setCreatedDateTime(LocalDateTime.now());
             save(splitSfc);
             String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo();
+            Router routerBySfcBo = routerService.getRouterBySfcBo(HandleEnum.SFC.getHandle(site, sfc));
+            sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),sfc, sfcData.getShopOrder(),routerBySfcBo.getHandle());
             return splitSfc;
         } catch (Exception e) {
             ExceptionUtil.throwException(e);

production/src/main/resources/mapper/SplitSfcMapper.xml

@@ -378,7 +378,7 @@
         WHERE S.HANDLE=#{handle}
     </select>
     <select id="getAbnormalQty" resultType="com.foreverwin.mesnac.production.dto.SplitSfcDto">
-    SELECT zab.NC_QTY,zsbd.ROUTER_BO,zab.NC_CODE FROM Z_ABNORMAL_BILL zab
+    SELECT zab.NC_QTY,zsbd.ROUTER_BO,zab.NC_CODE,zab.ABNORMAL_NO FROM Z_ABNORMAL_BILL zab
     JOIN Z_ABNORMAL_BILL_DISPOSE zsbd ON zab.HANDLE=ZSBD.ABNORMAL_BILL_BO
     WHERE  ZAB.SFC=#{sfc} AND zab.SITE=#{site} AND ZAB.OPERATION=#{operation} AND zab.STATUS='F' AND zab."TYPE"='Z' AND zsbd.ABNORMAL_METHOD='F'
     </select>