Merge remote-tracking branch 'origin/jtwy' into jtwy

yaowanxin

3 天以前 005e11377f508e3a79b528572a386a2af43697ca

Merge remote-tracking branch 'origin/jtwy' into jtwy

 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("未找到ID为[" + processRouteItemDto.getRouteId() + "]的产品订单");
        }
        SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectOne(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, productOrder.getSalesLedgerId()));

        if (salesLedgerProduct == null) {
            return R.fail("未找到销售台账ID为[" + 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);
                }

 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();

 src/main/resources/application-jtwy.yml

@@ -17,7 +17,7 @@
# 开发环境配置
server:
  # 服务器的HTTP端口，默认为8080
  port: 9090
  port: 9001
  servlet:
    # 应用的访问路径
    context-path: /