拆分修改

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

@@ -33,7 +33,7 @@ ftp:
 
 #打印服务器配置
 print:
-  server: http://localhost:8080/CodeSoftPrintWeb/printService
+  server: http://172.16.251.188:8022/print/mesnacprint
 
 activeMq:
   sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0

production/src/main/java/com/foreverwin/mesnac/production/controller/SplitSfcController.java

@@ -26,9 +26,9 @@ public class SplitSfcController {
 
     @ResponseBody
     @GetMapping("/getSfcData")
-    public R getSfcData(String sfc){
+    public R getSfcData(SfcDto dto){
         SfcDto result;
-        result = splitSfcService.getSfcData(sfc);
+        result = splitSfcService.getSfcData(dto);
         return R.ok(result);
     }
 
@@ -49,7 +49,7 @@ public class SplitSfcController {
 
     @ResponseBody
     @GetMapping("/splitSfc")
-    public R getSfcData(SfcDto sfcDto){
+    public R splitSfc(SfcDto sfcDto){
         return R.ok( splitSfcService.splitSfc(sfcDto));
     }
 

production/src/main/java/com/foreverwin/mesnac/production/mapper/SplitSfcMapper.java

@@ -20,5 +20,5 @@ public interface SplitSfcMapper extends BaseMapper<SplitSfc> {
 
     SfcDto getSfcData(@Param("handle") String handle);
 
-    SplitSfcDto getAbnormalQty(@Param("site")String site, @Param("sfc")String sfc, @Param("operation") String operation);
+    SplitSfcDto getAbnormalQty(@Param("site") String site, @Param("sfc") String sfc, @Param("operation") String operation,@Param("abnormalNo") String abnormalNo);
 }

production/src/main/java/com/foreverwin/mesnac/production/service/SplitSfcService.java

@@ -27,7 +27,7 @@ public interface SplitSfcService extends IService<SplitSfc> {
 
     List<SplitSfc> selectList(SplitSfc splitSfc);
 
-    SfcDto getSfcData(String sfc);
+    SfcDto getSfcData(SfcDto dto);
 
     SfcDto getGoodSfcData(String sfc);
 

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

@@ -73,9 +73,15 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
     }
 
     @Override
-    public SfcDto getSfcData(String sfc) {
+    public SfcDto getSfcData(SfcDto dto) {
         String site = CommonMethods.getSite();
-        String handle = HandleEnum.SFC.getHandle(site, sfc);
+        String handle = HandleEnum.SFC.getHandle(site, dto.getSfc());
+        if (StringUtil.isBlank(dto.getSfc())){
+            throw new BaseException("产品条码不能为空");
+        }
+        if (StringUtil.isBlank(dto.getAbnormalNo())){
+            throw new BaseException("异常单号不能为空");
+        }
         //根据sfc找工单等信息
         SfcDto sfcData = splitSfcMapper.getSfcData(handle);
         if (sfcData==null){
@@ -83,7 +89,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
         }
         String operation = sfcData.getOperation();
         //查询质量异常记录数量
-        SplitSfcDto sfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation);
+        SplitSfcDto sfcDto=splitSfcMapper.getAbnormalQty(site,dto.getSfc(),operation,dto.getAbnormalNo());
         if (sfcDto==null){
             throw new BaseException("未找到闭环关闭的质量异常");
         }
@@ -154,6 +160,10 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
     public SplitSfc splitSfc(SfcDto sfcDto){
         String site = CommonMethods.getSite();
         String sfc = sfcDto.getSfc();
+        String abnormalNo = sfcDto.getAbnormalNo();
+        if (StringUtil.isBlank(abnormalNo)){
+            throw new BaseException("异常单号不能为空");
+        }
         String handle = HandleEnum.SFC.getHandle(site, sfc);
         BigDecimal splitQty = new BigDecimal(sfcDto.getQty());
 
@@ -164,7 +174,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
             throw new BaseException("未找到产品条码信息");
         }
         //查询质量异常记录数量 处置工艺路线及不良代码
-        SplitSfcDto splitSfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation);
+        SplitSfcDto splitSfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation, abnormalNo);
         String routerBo = splitSfcDto.getRouterBo();
         String ncCode = splitSfcDto.getNcCode();
         if (StringUtil.isBlank(routerBo)){

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

@@ -380,7 +380,7 @@
     <select id="getAbnormalQty" resultType="com.foreverwin.mesnac.production.dto.SplitSfcDto">
     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='G' AND zab."TYPE"='Z' AND (zsbd.ABNORMAL_METHOD='F' OR zsbd.ABNORMAL_METHOD='C')
+    WHERE  ZAB.SFC=#{sfc} AND zab.ABNORMAL_NO=#{abnormalNo} AND zab.SITE=#{site} AND ZAB.OPERATION=#{operation} AND zab.STATUS='G' AND zab."TYPE"='Z' AND (zsbd.ABNORMAL_METHOD='F' OR zsbd.ABNORMAL_METHOD='C')
     </select>
 
 </mapper>