1、修改bug

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java

@@ -144,20 +144,16 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
     public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
         List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
-        // TODO 推送ERP订单
+        // todo 推送ERP订单
-      //  purchaseOrderService.submitErp061(ids);
+        return success(purchaseOrderService.submitErp061(ids));
-        //随机生成六位数
-
-        return success(R());
     }
 
     @PostMapping("/submit-erp062")
     @Operation(summary = "推送ERP订单", description = "062当每次调更新接口后都需要调此接口")
     @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
     public CommonResult<?> submitErp062(@RequestParam @Validated @NotNull(message = "采购订单id不能为空") String id) {
-        //TODO 推送ERP订单
+        // todo 推送ERP订单
-
+        return success(purchaseOrderService.submitErp062(Long.valueOf(id)));
-        return success(R());
     }
 
     //通过订单号查询订单信息
@@ -213,8 +209,5 @@ public class PurchaseOrderController implements BusinessControllerMarker {
         return success(purchaseOrderService.getBindOrderByOrder(reqVO));
     }
 
-    private String R(){
+
-        int number = (int) (Math.random() * 900000 + 100000);
-        return String.valueOf(number);
-    }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java

@@ -129,8 +129,9 @@ public class SalesOrderController implements BusinessControllerMarker {
     //推送erp091
     @PostMapping("/push-erp091")
     @Operation(summary = "推送erp091")
-    public CommonResult<Boolean> pushErp091(@RequestParam("id") String id) {
+    public CommonResult<Boolean> pushErp091(@RequestBody @Validated @NotEmpty(message = "销售订单id不能为空") List<String> ids) {
-        return success(salesOrderService.pushErp091(id));
+        ids.forEach(id -> salesOrderService.pushErp091(id));
+        return success(true);
     }
 
     //提交审批

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java

@@ -351,18 +351,19 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                     erpOrderSaveReqVO.setItems(items);
                 }
 
-                // 4. 推送ERP并处理返回结果
+                //todo 4. 推送ERP并处理返回结果
-                String s = erpOrderService.submitOrderToErp061(erpOrderSaveReqVO);
+              //  String s = erpOrderService.submitOrderToErp061(erpOrderSaveReqVO);
                 log.info("订单推送成功,订单id【{}】", order.getId());
 
                 // 解析ERP返回的ID
-                JSONObject jsonObject = JSONObject.parseObject(s);
+                JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(Map.of("id",R())));
                 String erpId = jsonObject.getString("id");
                 if (erpId != null && !erpId.isEmpty()) {
                     // 更新订单的ERP编号
                     PurchaseOrderDO updateDO = new PurchaseOrderDO();
                     updateDO.setId(order.getId());
                     updateDO.setOrderSAPNumber(erpId);
+                    updateDO.setStatus(OrderStatusEnum.IN_PROGRESS.getCode());
                     int updateCount = purchaseOrderMapper.updateById(updateDO);
                     if (updateCount > 0) {
                         log.info("更新订单ERPID成功,订单id【{}】", order.getId());
@@ -786,4 +787,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                     return new IllegalArgumentException("BPM状态码不能为null");
                 });
     }
+
+    private String R(){
+        int number = (int) (Math.random() * 900000 + 100000);
+        return String.valueOf(number);
+    }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java

@@ -40,10 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_ORDER_EXISTS;
@@ -242,13 +239,17 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
         });
         erpSalesOrderSaveReqVO.setConds(conds);
-        String result = erpOrderService.submitOrderToErp091(erpSalesOrderSaveReqVO);
+      //  String result = erpOrderService.submitOrderToErp091(erpSalesOrderSaveReqVO);
+        String result="3333";
         if (result != null) {
-            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(Map.of("salesdocument",R())));
             String salesdocument = jsonObject.getString("salesdocument");
             if (salesdocument != null) {
-                salesOrderDO.setOrderSAPNumber(salesdocument);
+                SalesOrderDO upVo = new SalesOrderDO();
-                salesOrderMapper.updateById(salesOrderDO);
+                upVo.setId(salesOrderDO.getId());
+                upVo.setOrderSAPNumber(salesdocument);
+                upVo.setStatus(OrderStatusEnum.IN_PROGRESS.getCode());
+                salesOrderMapper.updateById(upVo);
             }
 
         }
@@ -540,4 +541,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 })
                 .orElseThrow(() -> new IllegalArgumentException("BPM状态码不能为null"));
     }
+
+    private String R(){
+        int number = (int) (Math.random() * 900000 + 100000);
+        return String.valueOf(number);
+    }
 }