委外修改

src/main/java/com/gaotao/modules/api/service/impl/IfsApiIssueAndReturnServiceImpl.java

@@ -189,12 +189,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("IFS发料成功");
             }else{
                 logger.info("IFS发料成功"+ifsResponse);
-                throw new Exception("IFS发料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("领料出库同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -230,12 +231,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("IFS退料成功");
             }else{
                 logger.info("IFS退料失败"+ifsResponse);
-                throw new Exception("IFS退料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("退料同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -309,12 +311,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("MR预留数量成功");
             }else{
                 logger.info("MR预留数量失败"+ifsResponse);
-                throw new Exception("MR预留数量失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("MR预留数量出库同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -345,12 +348,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("MR发料成功");
             }else{
                 logger.info("MR发料失败"+ifsResponse);
-                throw new Exception("MR发料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("MR发料数量出库同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -470,12 +474,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("MR退料成功");
             }else{
                 logger.info("MR退料失败"+ifsResponse);
-                throw new Exception("MR退料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("MR退料数量出库同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -571,12 +576,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("委外发料成功");
             }else{
                 logger.info("Reserve委外发料失败"+ifsResponse);
-                throw new Exception("Reserve委外发料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("Reserve委外发料同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -609,12 +615,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("委外发料成功");
             }else{
                 logger.info("Issue委外发料失败"+ifsResponse);
-                throw new Exception("Issue委外发料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("Issue委外发料同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 
@@ -671,12 +678,13 @@ public class IfsApiIssueAndReturnServiceImpl implements IfsApiIssueAndReturnServ
                 logger.info("委外退料成功");
             }else{
                 logger.info("UnIssue委外退料失败"+ifsResponse);
-                throw new Exception("UnIssue委外退料失败");
+                String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
+                throw new Exception(errorMessage);
             }
             return ifsResponse;
         }catch (Exception e){
             e.printStackTrace();
-            throw new XJException("UnIssue委外退料同步IFS失败");
+            throw new XJException(e.getMessage());
         }
     }
 

src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingIssueServiceImpl.java

@@ -15,6 +15,7 @@ import com.gaotao.modules.trans.entity.TransCommonRequestDto;
 import com.gaotao.modules.trans.entity.TransCommonSubDto;
 import com.gaotao.modules.trans.entity.TransDetail;
 import com.gaotao.modules.trans.service.TransHeaderService;
+import jakarta.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -76,6 +77,7 @@ public class OutsourcingIssueServiceImpl implements OutsourcingIssueService {
     }
 
     @Override
+    @Transactional
     public void confirmOutsourcingDirectIssue(OutsourcingIssueDto outsourcingIssueDto) throws Exception {
         // TODO: 实现确认委外直接发料的逻辑
         // 这里应该：
@@ -138,10 +140,10 @@ public class OutsourcingIssueServiceImpl implements OutsourcingIssueService {
         for (TransDetail issue : out) {
             PurchaseOrderReserveComponentDto reserveComponentDto = new PurchaseOrderReserveComponentDto();
             reserveComponentDto.setIfsSiteID(outsourcingIssueDto.getSite());
-            reserveComponentDto.setIfsOrderNo(transCommonRequestDto.getWorkOrderNo());
+            reserveComponentDto.setIfsOrderNo(outsourcingIssueDto.getOrderNo());
             reserveComponentDto.setIfsLineNo(outsourcingIssueDto.getLineNo());
             reserveComponentDto.setIfsReleaseNo(outsourcingIssueDto.getReleaseNo());
-            reserveComponentDto.setIfsLineItemNo(issue.getItemNo().toString());
+            reserveComponentDto.setIfsLineItemNo(outsourcingIssueDto.getItemNo().toString());
             reserveComponentDto.setIfsOrderCode("1");
             reserveComponentDto.setIfsPartNo(issue.getPartNo());
             reserveComponentDto.setIfsLocationNo(issue.getLocationId());
@@ -149,7 +151,7 @@ public class OutsourcingIssueServiceImpl implements OutsourcingIssueService {
             reserveComponentDto.setIfsSerialNo("*");
             reserveComponentDto.setIfsEngChgLevel("1");
             reserveComponentDto.setIfsWDRNo(issue.getWdrNo());
-            reserveComponentDto.setIfsActivitySequenceNo(outsourcingIssueDto.getSequenceNo());
+            reserveComponentDto.setIfsActivitySequenceNo("0");
             reserveComponentDto.setIfsHandlingUnitID("0");
             reserveComponentDto.setIfsReverseQty(issue.getTransQty());
             String s = ifsApiIssueAndReturnService.addPurchaseOrderReserveComponent(reserveComponentDto);