Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-05 45a4fb8ff4ddb4cfeaefd81da2bd8f22bbc26d1b

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/src/main/java/com/example/erp/controller/AppController.java

@@ -1,18 +1,17 @@
package com.example.erp.controller;

import com.example.erp.common.Result;
import com.example.erp.dto.pp.WorkInProgressDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.service.mm.FinishedGoodsInventoryService;
import com.example.erp.service.mm.MaterialInventoryService;
import com.example.erp.service.pp.ReportService;
import com.example.erp.service.sd.DeliveryService;
import com.example.erp.service.sd.OrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDate;
import java.util.List;
@@ -26,6 +25,7 @@
    private final DeliveryService deliveryService;
    private final MaterialInventoryService materialInventoryService;
    private final FinishedGoodsInventoryService finishedGoodsInventoryService;
    private final ReportService reportService;

    @ApiOperation("订单报表")
    @PostMapping("/getOrderList")
@@ -51,4 +51,11 @@
    public Result getFinishedGoodsInventoryList() {
        return Result.success(finishedGoodsInventoryService.appFinishedGoodsInventoryList());
    }

    @ApiOperation("半成品库存报表")
    @PostMapping("/getWorkInProgress/{selectProcesses}")
    public Result workInProgress(@PathVariable String selectProcesses,WorkInProgressDTO workInProgressDTO) {
        return Result.success(reportService.workInProgressSv(1, 999999999, "", "", selectProcesses,"", workInProgressDTO));

    }
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -82,7 +82,10 @@
                              .eq("prod_id", orderDetail.getProductId())
                              .eq("glass_sort",dto1.getTechnologyNumber())
                      );
              dto1.setGlassName(productDetail.getDetail());
              if(productDetail!=null){
                  dto1.setGlassName(productDetail.getDetail());
              }

            //basicData.getNickname().equals("stepC")
          }else if(basicData.getNickname().equals("stepC")){
              OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -251,7 +251,7 @@
                           on e.process_id = c.process_id
                               and e.technology_number = c.technology_number
                               and e.order_number = c.order_number
        where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0
        where a.order_id = #{orderId} and d.create_order>0 
        group by c.order_number,
                 c.technology_number,
                 c.process_id