From 005e11377f508e3a79b528572a386a2af43697ca Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java |   22 ++++++++++++++++++++++
 src/main/resources/application-jtwy.yml                                              |    2 +-
 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java            |    3 +++
 3 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
index 5a502d7..c69ab38 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
@@ -4,11 +4,17 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.production.dto.ProductProcessRouteItemDto;
+import com.ruoyi.production.mapper.ProductOrderMapper;
 import com.ruoyi.production.mapper.ProductWorkOrderMapper;
+import com.ruoyi.production.pojo.ProductOrder;
 import com.ruoyi.production.pojo.ProductProcessRouteItem;
 import com.ruoyi.production.pojo.ProductWorkOrder;
 import com.ruoyi.production.service.ProductProcessRouteItemService;
 import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -29,11 +35,14 @@
 @Api(tags = "鐢熶骇宸ヨ壓璺嚎")
 public class ProductProcessRouteItemController {
 
+    private final ProductOrderMapper productOrderMapper;
     private ProductProcessRouteItemService productProcessRouteItemService;
 
     private ProductWorkOrderService productWorkOrderService;
 
     private ProductWorkOrderMapper productWorkOrderMapper;
+
+    private SalesLedgerProductMapper salesLedgerProductMapper;
 
     @GetMapping("list")
     @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓椤圭洰")
@@ -45,6 +54,18 @@
     @ApiOperation("鎵归噺鏂板淇敼")
     @Transactional(rollbackFor = Exception.class)
     public R addOrUpdate(@RequestBody ProductProcessRouteItemDto processRouteItemDto) {
+
+        ProductOrder productOrder = productOrderMapper.selectById(processRouteItemDto.getRouteId());
+        if (productOrder == null) {
+            return R.fail("鏈壘鍒癐D涓篬" + processRouteItemDto.getRouteId() + "]鐨勪骇鍝佽鍗�");
+        }
+        SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectOne(new LambdaQueryWrapper<SalesLedgerProduct>()
+                .eq(SalesLedgerProduct::getSalesLedgerId, productOrder.getSalesLedgerId()));
+
+        if (salesLedgerProduct == null) {
+            return R.fail("鏈壘鍒伴攢鍞彴璐D涓篬" + productOrder.getSalesLedgerId() + "]鐨勫彴璐︿骇鍝�");
+        }
+
         List<ProductProcessRouteItem> items = processRouteItemDto.getProcessRouteItem();
         if (CollectionUtils.isEmpty(items)) {
             return R.ok();
@@ -92,6 +113,7 @@
                     workOrder.setProductProcessRouteItemId(item.getId());
                     workOrder.setProductOrderId(item.getRouteId());
                     workOrder.setWorkOrderNo(workOrderNoStr);
+                    workOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
                     workOrder.setStatus(1);
                     workOrders.add(workOrder);
                 }
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 3e120d1..cbb2e00 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -15,6 +15,7 @@
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import com.ruoyi.sales.service.ISalesLedgerProductService;
 import com.ruoyi.sales.service.ISalesLedgerService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +34,7 @@
 @RestController
 @RequestMapping("/purchase/ledger")
 @AllArgsConstructor
+@Api(tags = "111")
 public class PurchaseLedgerController extends BaseController {
     private IPurchaseLedgerService purchaseLedgerService;
 
@@ -92,6 +94,7 @@
     /**
      * 鏌ヨ閲囪喘妯℃澘
      */
+    @ApiOperation("/2222")
     @GetMapping("/getPurchaseTemplateList")
     public AjaxResult getPurchaseTemplateList() {
         PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
diff --git a/src/main/resources/application-jtwy.yml b/src/main/resources/application-jtwy.yml
index b324352..e2aa4c5 100644
--- a/src/main/resources/application-jtwy.yml
+++ b/src/main/resources/application-jtwy.yml
@@ -17,7 +17,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 9090
+  port: 9001
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /

--
Gitblit v1.9.3