检验合格入库

src/main/java/com/gaotao/modules/inspection/service/IfsInspectionHistoryService.java

@@ -13,14 +13,7 @@ public interface IfsInspectionHistoryService {
      * 获取IFS检验历史数据
      * @return IFS检验历史数据列表
      */
-    List<IfsInspectionHistoryDto> getIfsInspectionHistory();
-    
-    /**
-     * 根据参数获取IFS检验历史数据
-     * @param ifsTransactionID 事务ID
-     * @return IFS检验历史数据列表
-     */
-    List<IfsInspectionHistoryDto> getIfsInspectionHistory(String ifsTransactionID);
+    List<IfsInspectionHistoryDto> getIfsInspectionHistory(String site);
 
     /**
      * 处理IFS检验历史数据，更新采购接收单明细

src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java

@@ -66,9 +66,9 @@ public class IfsInspectionHistoryServiceImpl implements IfsInspectionHistoryServ
     }
 
     @Override
-    public List<IfsInspectionHistoryDto> getIfsInspectionHistory() {
+    public List<IfsInspectionHistoryDto> getIfsInspectionHistory(String site) {
         SysParam ifsSiteIdParam = new SysParam();
-        ifsSiteIdParam.setSite("55");
+        ifsSiteIdParam.setSite(site);
         ifsSiteIdParam.setGroupCode("IFS");
         ifsSiteIdParam.setCode("ifsTransactionID");
         String ifsTransId = baseMapper.getSysParamValue(ifsSiteIdParam);
@@ -78,7 +78,7 @@ public class IfsInspectionHistoryServiceImpl implements IfsInspectionHistoryServ
             Map<String, Object> params = Map.of(
                 "ifsDBName", ifsDBName,
                 "domainUserID", getCurrentDomainUserID(),
-                    "ifsSiteID", "55",
+                    "ifsSiteID", site,
                     "ifsTransactionID", ifsTransId
             );
 
@@ -104,41 +104,6 @@ public class IfsInspectionHistoryServiceImpl implements IfsInspectionHistoryServ
         }
     }
 
-    @Override
-    public List<IfsInspectionHistoryDto> getIfsInspectionHistory(String ifsTransactionID) {
-        try {
-            log.info("开始调用IFS检验历史接口，事务ID: {}", ifsTransactionID);
-            
-            // 构建请求参数
-            Map<String, Object> params = Map.of(
-                "ifsDBName", ifsDBName,
-                "domainUserID", getCurrentDomainUserID(),
-                "ifsSiteID", "55",
-                "ifsTransactionID", ifsTransactionID != null ? ifsTransactionID : "100063053"
-            );
-
-            ObjectMapper objectMapper = new ObjectMapper();
-            String jsonBody = objectMapper.writeValueAsString(params);
-
-            // 调用IFS接口
-            String ifsResponse = HttpUtils.doGetWithBody(ifsUrl + "POInspectionHistory", jsonBody, null);
-
-            // 解析响应数据
-            ObjectMapper mapper = new ObjectMapper();
-            List<IfsInspectionHistoryDto> historyList = mapper.readValue(
-                ifsResponse,
-                new TypeReference<List<IfsInspectionHistoryDto>>() {}
-            );
-
-            log.info("成功获取IFS检验历史数据，共{}条记录", historyList != null ? historyList.size() : 0);
-            return historyList;
-
-        } catch (Exception e) {
-            log.error("调用IFS检验历史接口失败: {}", e.getMessage(), e);
-            throw new RuntimeException("获取IFS检验历史数据失败: " + e.getMessage(), e);
-        }
-    }
-
     @Override
     public void processInspectionHistory(List<IfsInspectionHistoryDto> historyList) {
         if (historyList == null || historyList.isEmpty()) {
@@ -305,10 +270,10 @@ public class IfsInspectionHistoryServiceImpl implements IfsInspectionHistoryServ
             log.info("开始执行IFS检验历史同步任务");
 
             // 获取IFS检验历史数据
-            List<IfsInspectionHistoryDto> historyList = getIfsInspectionHistory();
+            /*List<IfsInspectionHistoryDto> historyList = getIfsInspectionHistory();
 
             // 处理数据并更新本地记录
-            processInspectionHistory(historyList);
+            processInspectionHistory(historyList);*/
 
             log.info("IFS检验历史同步任务执行完成");
         } catch (Exception e) {

src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java

@@ -629,10 +629,15 @@ public class InspectionInboundServiceImpl implements InspectionInboundService {
             log.info("开始从IFS获取检验不合格数据");
 
             // 调用IFS服务获取检验历史数据
-            List<IfsInspectionHistoryDto> ifsHistoryList = ifsInspectionHistoryService.getIfsInspectionHistory();
+            List<IfsInspectionHistoryDto> ifsHistoryList = ifsInspectionHistoryService.getIfsInspectionHistory(unqualifiedInspectionDto.getSite());
 
             List<UnqualifiedInspectionDto> result = new ArrayList<>();
+            if (unqualifiedInspectionDto.getTransNo() != null) {
+                ifsHistoryList = ifsHistoryList.stream()
+                        .filter(h -> unqualifiedInspectionDto.getTransNo().equals(h.getOrderNo()))
+                        .toList();
 
+            }
             for (IfsInspectionHistoryDto ifsHistory : ifsHistoryList) {
                 // 根据transactionCode判断处理类型
                 String processType = mapTransactionCodeToProcessType(ifsHistory.getTransactionCode());

src/main/java/com/gaotao/modules/inspection/service/impl/QualifiedStorageServiceImpl.java

@@ -106,9 +106,9 @@ public class QualifiedStorageServiceImpl implements QualifiedStorageService {
             // 调用IFS接口获取采购订单接收记录
             List<PurchaseOrderReceiptVo> allReceipts = ifsApiIssueAndReturnService.getPurchaseOrderReceipt(purchaseOrderNo, site);
 
-            // 只保留状态为ARRIVED的记录
+            // 只保留状态为To be Received的记录
             List<PurchaseOrderReceiptVo> arrivedReceipts = allReceipts.stream()
-                    .filter(receipt -> "ARRIVED".equals(receipt.getState()) && receipt.getQtyToInspect() == 0)
+                    .filter(receipt -> "To be Received".equals(receipt.getState()) && receipt.getQtyToInspect() == 0)
                     .collect(Collectors.toList());
 
             return R.ok().put("rows", arrivedReceipts);

src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java

@@ -57,8 +57,14 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
 
 	@Override
 	public void logout(long userId) {
-		//删除token记录
-		this.removeById(userId);
+		//生成一个token
+		String token = TokenGenerator.generateValue();
+
+		//修改token
+		SysUserTokenEntity tokenEntity = new SysUserTokenEntity();
+		tokenEntity.setUserId(userId);
+		tokenEntity.setToken(token);
+		this.updateById(tokenEntity);
 	}
 
 	@Override