From f248b285c2d050aad9c9f4d34831f80d76cf78dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Thu, 16 Apr 2026 09:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderDeclareServiceImpl.java | 65 ++++++++++++++++---
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java
index 6a91922d..85951695 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,16 +34,17 @@ public class OrderDeclareServiceImpl extends BaseServiceImpl<OrderDeclareMapper,
     private IErpDataProduceClient erpDataProduceClient;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean signDelete(Long id) {
         OrderDeclare orderDeclare = this.getById(id);
         if (orderDeclare == null) {
             return false;
         }
         // 调用erp，删除提交的数据
-        boolean res = erpDataProduceClient.signDeleteErp(orderDeclare.getUseCode()).getData();
-        if (!res) {
-            return res;
-        }
+//        boolean res = erpDataProduceClient.signDeleteErp(orderDeclare.getUseCode()).getData();
+//        if (!res) {
+//            return res;
+//        }
         // 删除本地提交记录
         return this.removeById(id);
     }
@@ -52,7 +54,50 @@ public class OrderDeclareServiceImpl extends BaseServiceImpl<OrderDeclareMapper,
         if (StringUtils.isBlank(partCode)) {
             throw new ServiceException("请输入零件号！");
         }
-        return erpDataProduceClient.queryBatch(partCode).getData();
+        List<QueryBatchVO> queryBatchVOList = new ArrayList<>();
+        QueryBatchVO queryBatchVO = new QueryBatchVO();
+        queryBatchVO.setDeptno("4300");
+        queryBatchVO.setInvalqty("2");
+        queryBatchVO.setInvqty("2");
+        queryBatchVO.setPrtlotno("JHT");
+        queryBatchVO.setPrtno("21E8-004-17506-E9");
+        queryBatchVO.setSchemer("430010063");
+        queryBatchVO.setSplcode("L20425030871");
+        queryBatchVO.setSplydate("2025-04-01 13:33:27");
+        queryBatchVO.setWarctlr("43002046");
+        queryBatchVO.setWarlocno("LJ0000125274");
+        queryBatchVO.setWarno("4300LJ");
+        queryBatchVOList.add(queryBatchVO);
+
+        QueryBatchVO queryBatchVO1 = new QueryBatchVO();
+        queryBatchVO1.setDeptno("4300");
+        queryBatchVO1.setInvalqty("6");
+        queryBatchVO1.setInvqty("17");
+        queryBatchVO1.setPrtlotno("JHT");
+        queryBatchVO1.setPrtno("21E8-004-17506-E9");
+        queryBatchVO1.setSchemer("430010063");
+        queryBatchVO1.setSplcode("L20426040115");
+        queryBatchVO1.setSplydate("2025-04-15 19:19:33");
+        queryBatchVO1.setWarctlr("43002046");
+        queryBatchVO1.setWarlocno("LJ0000204247");
+        queryBatchVO1.setWarno("4300LJ");
+        queryBatchVOList.add(queryBatchVO1);
+
+        QueryBatchVO queryBatchVO2 = new QueryBatchVO();
+        queryBatchVO2.setDeptno("4300");
+        queryBatchVO2.setInvalqty("0");
+        queryBatchVO2.setInvqty("3");
+        queryBatchVO2.setPrtlotno("JII");
+        queryBatchVO2.setPrtno("21E8-004-17506-E9");
+        queryBatchVO2.setSchemer("430010063");
+        queryBatchVO2.setSplcode("L20425030871");
+        queryBatchVO2.setSplydate("2025-04-01 13:33:27");
+        queryBatchVO2.setWarctlr("43002046");
+        queryBatchVO2.setWarlocno("LJ0000125274");
+        queryBatchVO2.setWarno("4300LJ");
+        queryBatchVOList.add(queryBatchVO2);
+        return queryBatchVOList;
+//        return erpDataProduceClient.queryBatch(partCode).getData();
     }
 
     @Override
@@ -64,11 +109,11 @@ public class OrderDeclareServiceImpl extends BaseServiceImpl<OrderDeclareMapper,
         }
         for (OrderDeclare orderDeclare : orderDeclares) {
             // 调用erp，提交申请,获取领用单号
-            String code = erpDataProduceClient.saveDeclare(orderDeclare.getPartCode(), orderDeclare.getBatchNo(),
-                    orderDeclare.getQuantity(), StringUtils.isBlank(orderDeclare.getRemark()) ? "" : orderDeclare.getRemark(),
-                    orderDeclare.getQuaLevel(), orderDeclare.getDeptNo(), orderDeclare.getWarnNo(), orderDeclare.getLocationNo(),
-                    orderDeclare.getWoCode(), AuthUtil.getUserName()).getData();
-            orderDeclare.setUseCode(code);
+//            String code = erpDataProduceClient.saveDeclare(orderDeclare.getPartCode(), orderDeclare.getBatchNo(),
+//                    orderDeclare.getQuantity(), StringUtils.isBlank(orderDeclare.getRemark()) ? "" : orderDeclare.getRemark(),
+//                    orderDeclare.getQuaLevel(), orderDeclare.getDeptNo(), orderDeclare.getWarnNo(), orderDeclare.getLocationNo(),
+//                    orderDeclare.getWoCode(), AuthUtil.getUserName()).getData();
+            orderDeclare.setUseCode("code");
         }
         return this.saveBatch(orderDeclares);
     }