物料优化

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

@@ -212,7 +212,7 @@ public class SalesOrderController implements BusinessControllerMarker {
 
     //feign测试
     @GetMapping("/get-sales-order-details-by-order-id")
-    public CommonResult<?> getSalesOrderDetailsByOrderId(@RequestParam("orderId") Long orderId) {
-        return success(orderApi.getSalesOrderDetailsById(orderId));
+    public CommonResult<?> getSalesOrderDetailsByOrderId(@RequestParam("orderId") String orderId) {
+        return success(orderApi.getOrderByOrderNos(List.of(orderId.toString())));
     }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java

@@ -135,7 +135,7 @@ public class EntrustOrderDetailDO extends BusinessBaseDO {
     * 是否启用
     */
     @TableField("IS_ENB")
-    private Boolean isEnable;
+    private String isEnable;
     /**
     * 短文本
     */

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

@@ -331,6 +331,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     // 成功：更新为FIND状态
                     upVo.setErpStatus(OrderStatusEnum.FIND.getCode());
                     upVo.setCause("ERP订单提交成功，SAP单号：" + salesdocument);
+                    //价格条件flag变更为U
+                    updateConditionFlag(salesOrderDetailByOrderId);
                 } else {
                     // 失败：拼接详细原因
                     StringBuilder failMsg = new StringBuilder("ERP订单提交失败：");
@@ -364,6 +366,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     }
 
+    private void updateConditionFlag(List<SalesOrderDetailRespVO> salesOrderDetailList){
+        log.info("更新明细的价格条件操作类型为U，ID：【{}】", salesOrderDetailList.stream().map(SalesOrderDetailRespVO::getId).toList());
+        salesOrderDetailService.updateSalesOrderDetailList(BeanUtils.toBean(salesOrderDetailList,SalesOrderDetailSaveReqVO.class));
+    }
+
 
     @Override
     @Transactional