From 4c8144cc2785cdb8c5529c6c59a8901a33ec06bb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 24 四月 2026 17:55:00 +0800
Subject: [PATCH] feat:1.生产计划下发 2.订单-工艺路线，bom，工序
---
src/main/resources/mapper/technology/TechnologyRoutingMapper.xml | 31 +-
src/main/java/com/ruoyi/production/bean/vo/ProductionBomStructureVo.java | 27 ++
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java | 10
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java | 5
src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java | 2
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java | 2
src/main/java/com/ruoyi/production/mapper/ProductionOrderRoutingOperationMapper.java | 6
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 3
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 2
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 94 +++++++-
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 3
src/main/java/com/ruoyi/production/service/ProductionBomStructureService.java | 5
src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java | 18 +
src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 102 +++++++--
src/main/java/com/ruoyi/production/service/ProductionOrderService.java | 2
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml | 8
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 8
src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java | 3
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 40 +--
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 2
src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml | 22 ++
src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml | 2
src/main/resources/mapper/production/ProductionOrderMapper.xml | 12
src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java | 4
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 8
src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java | 2
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java | 4
src/main/java/com/ruoyi/production/mapper/ProductionBomStructureMapper.java | 6
src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java | 7
/dev/null | 132 ------------
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java | 23 ++
src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java | 37 +++
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 2
src/main/resources/mapper/production/ProductionBomStructureMapper.xml | 14 +
35 files changed, 396 insertions(+), 254 deletions(-)
diff --git a/doc/add.sql b/doc/add.sql
deleted file mode 100644
index 8902911..0000000
--- a/doc/add.sql
+++ /dev/null
@@ -1,132 +0,0 @@
-
-# 璁惧鍙拌处
-create table `product-inventory-management`.device_repair
-(
- id bigint auto_increment
- primary key,
- device_ledger_id varchar(255) not null comment '璁惧鍙拌处id',
- repair_time timestamp null comment '鎶ヤ慨鏃ユ湡',
- repair_name varchar(255) not null comment '鎶ヤ慨浜�',
- remark varchar(255) not null comment '鏁呴殰鐜拌薄',
- maintenance_name varchar not null comment '缁翠慨浜�',
- maintenance_time timestamp null comment '缁翠慨鏃堕棿',
- maintenance_result varchar(255) null comment '缁翠慨缁撴灉',
- status int default 0 comment '鐘舵��',
- create_time datetime null comment '褰曞叆鏃堕棿',
- update_time datetime null comment '鏇存柊鏃堕棿',
- create_user varchar(255) not null comment '褰曞叆浜�',
- update_user varchar(255) not null comment '鏇存柊浜�',
- tenant_id bigint not null comment '绉熸埛id'
-);
-
-# 璁惧缁翠慨
-create table `product-inventory-management`.device_ledger
-(
- id bigint auto_increment
- primary key,
- device_name varchar(255) not null comment '璁惧鍚嶇О',
- device_model varchar(255) not null comment '瑙勬牸鍨嬪彿',
- supplier_name varchar(255) not null comment '渚涘簲鍟�',
- unit varchar(255) not null comment '鍗曚綅',
- number decimal not null comment '鏁伴噺',
- tax_including_price_unit decimal not null comment '鍚◣鍗曚环',
- tax_including_price_total decimal not null comment '鍚◣鎬讳环',
- tax_rate decimal not null comment '绋庣巼',
- un_tax_including_price_total decimal not null comment '涓嶅惈绋庢�讳环',
- create_time timestamp null comment '褰曞叆鏃堕棿',
- update_time timestamp null comment '鏇存柊鏃堕棿',
- create_user varchar(255) not null comment '褰曞叆浜�',
- update_user varchar(255) not null comment '鏇存柊浜�',
- tenant_id bigint not null comment '绉熸埛id'
-);
-
-create table `product-inventory-management`.device_maintenance
-(
- id bigint auto_increment
- primary key,
- device_ledger_id varchar(255) not null comment '璁惧鍙拌处id',
- maintenance__plan_time timestamp null comment '璁″垝淇濆吇鏃ユ湡',
- maintenance_actually_name varchar(255) not null comment '瀹為檯淇濆吇浜�',
- maintenance_actually_time timestamp null comment '瀹為檯淇濆吇鏃ユ湡',
- maintenance_result int not null default 0 comment '淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ',
- status int not null default 0 comment '鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨',
- create_time datetime null comment '褰曞叆鏃堕棿',
- update_time datetime null comment '鏇存柊鏃堕棿',
- create_user varchar(255) not null comment '褰曞叆浜�',
- update_user varchar(255) not null comment '鏇存柊浜�',
- tenant_id bigint not null comment '绉熸埛id'
-);
-
-
-alter table purchase_ledger
- add payment_method varchar(255) null;
-alter table sales_ledger
- add payment_method varchar(255) null;
-
-
-alter table payment_registration
- modify sale_ledger_id bigint default 0 null comment '閿�鍞彴璐d';
-
-
-alter table ticket_registration
- add enter_date timestamp null;
-
-alter table product_record
- add 鍒梍name int null comment 'sale_ledger_projectI_id';
-
-# 娣诲姞璁惧鍚嶇О鍜岃鏍煎瀷鍙�
-ALTER TABLE `product-inventory-management`.`device_repair`
- ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
- ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;
-
-ALTER TABLE `product-inventory-management`.`device_maintenance`
- ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
- ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;
-
-
-
-DROP TABLE IF EXISTS storage_attachment;
-CREATE TABLE storage_attachment (
- id BIGINT AUTO_INCREMENT PRIMARY KEY,
- create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- deleted BIGINT DEFAULT 0 NOT NULL,
- record_type SMALLINT DEFAULT 0 NOT NULL,
- record_id BIGINT DEFAULT 0 NOT NULL,
- name VARCHAR(100) DEFAULT '' NOT NULL,
- storage_blob_id BIGINT DEFAULT 0 NOT NULL
-) COMMENT='閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_attachment
- COMMENT '閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_attachment MODIFY record_type SMALLINT COMMENT '鍏宠仈鐨勮褰曠被鍨�';
-ALTER TABLE storage_attachment MODIFY record_id BIGINT COMMENT '鍏宠仈鐨勮褰昳d';
-ALTER TABLE storage_attachment MODIFY name VARCHAR(100) COMMENT '鍚嶇О, 濡�: file, avatar (鍖哄垎鍚屼竴鏉¤褰曚笉鍚岀被鍨嬬殑闄勪欢)';
-ALTER TABLE storage_attachment MODIFY storage_blob_id BIGINT COMMENT '鍏宠仈storage_blob璁板綍id';
-
-CREATE INDEX idx_storage_attachment_on_record
- ON storage_attachment (record_type, record_id);
-
-
-CREATE TABLE storage_blob (
- id BIGINT AUTO_INCREMENT PRIMARY KEY,
- create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- key_name VARCHAR(150) DEFAULT '' NOT NULL,
- content_type VARCHAR(100) DEFAULT '' NOT NULL,
- original_filename VARCHAR(255) DEFAULT '' NOT NULL,
- bucket_filename VARCHAR(255) DEFAULT '' NOT NULL,
- bucket_name VARCHAR(255) DEFAULT '' NOT NULL,
- byte_size BIGINT DEFAULT 0 NOT NULL,
- UNIQUE (key_name)
-) COMMENT='閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_blob
- COMMENT '閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_blob MODIFY key_name VARCHAR(150) COMMENT '璧勬簮id';
-ALTER TABLE storage_blob MODIFY content_type VARCHAR(100) COMMENT '璧勬簮绫诲瀷锛屼緥濡侸PG鍥剧墖鐨勮祫婧愮被鍨嬩负image/jpg';
-ALTER TABLE storage_blob MODIFY original_filename VARCHAR(255) COMMENT '鍘熸枃浠跺悕绉�';
-ALTER TABLE storage_blob MODIFY bucket_filename VARCHAR(255) COMMENT '瀛樺偍妗朵腑鏂囦欢鍚�';
-ALTER TABLE storage_blob MODIFY bucket_name VARCHAR(255) COMMENT '瀛樺偍妗跺悕';
-ALTER TABLE storage_blob MODIFY byte_size BIGINT COMMENT '璧勬簮灏哄(瀛楄妭)';
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
index 6d267b7..b7b0efa 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
@@ -38,7 +38,7 @@
private Long returnManagementId;
@Schema(description = "閫�璐т骇鍝乮d")
- private Long returnSaleLedgerProductId;
+ private Long returnsalesLedgerProductId;
@Schema(description = "閫�璐т骇鍝佹暟閲�")
private BigDecimal num;
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionBomStructureVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionBomStructureVo.java
new file mode 100644
index 0000000..36f9221
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionBomStructureVo.java
@@ -0,0 +1,27 @@
+package com.ruoyi.production.bean.vo;
+
+import com.ruoyi.production.pojo.ProductionBomStructure;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductionBomStructureVo extends ProductionBomStructure {
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String operationName;
+
+ @Schema(description = "浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "浜у搧ID")
+ private Long productId;
+
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ private String model;
+
+ private List<ProductionBomStructureVo> children;
+}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java
new file mode 100644
index 0000000..8126f67
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java
@@ -0,0 +1,23 @@
+package com.ruoyi.production.bean.vo;
+
+import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProductionOrderRoutingOperationVo extends ProductionOrderRoutingOperation {
+
+ @Schema(description = "浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ private String model;
+
+ @Schema(description = "鍗曚綅")
+ private String unit;
+
+ @Schema(description = "鍩虹宸ュ簭ID")
+ private Long technologyOperationId;
+}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
index 81e6c3e..0596973 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -4,9 +4,11 @@
import com.ruoyi.production.pojo.ProductionOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
+@EqualsAndHashCode(callSuper = true)
@Data
@Schema(name = "ProductionOrderVo", description = "鐢熶骇璁㈠崟杩斿洖瀵硅薄")
public class ProductionOrderVo extends ProductionOrder {
@@ -27,4 +29,7 @@
@Schema(description = "浜у搧鍥剧墖")
private List<StorageBlobVO> productImages;
+
+ @Schema(description = "bom缂栧彿")
+ private String bomNo;
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java
index da98401..2ff08ba 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionBomStructureController.java
@@ -1,7 +1,16 @@
package com.ruoyi.production.controller;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
+import com.ruoyi.production.service.ProductionBomStructureService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -13,6 +22,15 @@
*/
@RestController
@RequestMapping("/productionBomStructure")
+@AllArgsConstructor
public class ProductionBomStructureController {
+ private ProductionBomStructureService productionBomStructureService;
+
+ @GetMapping("/listByBomId/{bomId}")
+ @Operation(summary = "鏍规嵁BOM鏌ヨ鐢熶骇璁㈠崟BOM缁撴瀯鏍�")
+ public R<List<ProductionBomStructureVo>> listByBomId(@PathVariable Long bomId) {
+ return R.ok(productionBomStructureService.listByBomId(bomId));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 5421995..b875fd4 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -7,19 +7,12 @@
import com.ruoyi.production.bean.vo.ProductionOrderVo;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.service.ProductionOrderService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-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.util.List;
@@ -45,36 +38,35 @@
@GetMapping("/{id}")
@Operation(summary = "鐢熶骇璁㈠崟璇︽儏")
- public R<ProductionOrderVo> getInfo(@PathVariable("id") Long id) {
+ public R<ProductionOrderVo> getInfo(@PathVariable Long id) {
return R.ok(productionOrderService.getProductionOrderInfo(id));
}
- @PostMapping
- @Operation(
- summary = "鏂板鐢熶骇璁㈠崟",
- description = "鏂板涓嬪崟鍙敮鎸佷袱绉嶆柟寮忥細1. 鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
+ @PostMapping("/addOrder")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟", description = "鏂板涓嬪崟鍙敮鎸佷袱绉嶆柟寮忥細1. 鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
+ "2. 鎵嬪姩鏂板锛屽繀椤讳紶 productModelId 鍜� quantity銆�"
- + "technologyRoutingId 涓虹┖鏃朵細鑷姩鍖归厤璇ヤ骇鍝佽鏍兼渶鏂板伐鑹鸿矾绾匡紝quantity 鏈�缁堝繀椤诲ぇ浜� 0銆�"
- )
- @io.swagger.v3.oas.annotations.parameters.RequestBody(
- required = true,
- description = "鍓嶇鍙嬪ソ鎻愮ず锛氬鏋滄槸鐢熶骇璁″垝鐢熸垚锛岃浼� productionPlanIds锛�"
- + "濡傛灉鏄墜鍔ㄦ柊澧烇紝璇疯嚦灏戝～鍐� productModelId銆乹uantity锛屼笖 quantity 蹇呴』澶т簬 0銆�",
- content = @Content(schema = @Schema(implementation = ProductionOrder.class))
- )
+ + "technologyRoutingId 涓虹┖鏃朵細鑷姩鍖归厤璇ヤ骇鍝佽鏍兼渶鏂板伐鑹鸿矾绾匡紝quantity 鏈�缁堝繀椤诲ぇ浜� 0銆�")
+ @io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, description = "鍓嶇鍙嬪ソ鎻愮ず锛氬鏋滄槸鐢熶骇璁″垝鐢熸垚锛岃浼� productionPlanIds锛�"
+ + "濡傛灉鏄墜鍔ㄦ柊澧烇紝璇疯嚦灏戝～鍐� productModelId銆乹uantity锛屼笖 quantity 蹇呴』澶т簬 0銆�", content = @Content(schema = @Schema(implementation = ProductionOrder.class)))
public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
- @PutMapping
+ @PutMapping("/editOrder")
@Operation(summary = "淇敼鐢熶骇璁㈠崟")
public R<Boolean> edit(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
+ @Operation(summary = "缁戝畾宸ヨ壓璺嚎")
+ @PostMapping("/bindingRoute")
+ public R bindingRoute(@RequestBody ProductionOrderDto productionOrderDto) {
+ return R.ok(productionOrderService.bindingRoute(productionOrderDto));
+ }
+
@PostMapping("/syncSnapshot/{id}")
@Operation(summary = "鍚屾鐢熶骇璁㈠崟宸ヨ壓/BOM蹇収")
- public R<Integer> syncSnapshot(@PathVariable("id") Long id) {
+ public R<Integer> syncSnapshot(@PathVariable Long id) {
return R.ok(productionOrderService.syncProductionOrderSnapshot(id));
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionBomStructureMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionBomStructureMapper.java
index ac9d3d0..17c1c99 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionBomStructureMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionBomStructureMapper.java
@@ -1,8 +1,12 @@
package com.ruoyi.production.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
import com.ruoyi.production.pojo.ProductionBomStructure;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -15,4 +19,6 @@
@Mapper
public interface ProductionBomStructureMapper extends BaseMapper<ProductionBomStructure> {
+ List<ProductionBomStructureVo> listByBomId(@Param("bomId") Long bomId);
+
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionOrderRoutingOperationMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionOrderRoutingOperationMapper.java
index 83636c7..8b34b08 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionOrderRoutingOperationMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionOrderRoutingOperationMapper.java
@@ -1,8 +1,12 @@
package com.ruoyi.production.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -15,4 +19,6 @@
@Mapper
public interface ProductionOrderRoutingOperationMapper extends BaseMapper<ProductionOrderRoutingOperation> {
+ List<ProductionOrderRoutingOperationVo> selectVoListByOrderId(@Param("orderId") Long orderId);
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index 145fad6..a99ea09 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -65,7 +65,7 @@
private LocalDateTime endTime;
@Schema(description = "閿�鍞骇鍝佽鏍糹d銆傜敓浜т笅鍗曟帴鍙ｄ竴鑸笉浣滀负鍓嶇蹇呭～椤癸紝瀛樺湪閿�鍞潵婧愭椂鐢辩郴缁熷唴閮ㄥ叧鑱斻��")
- private Integer saleLedgerProductId;
+ private Integer salesLedgerProductId;
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
index 8e8317e..941fb49 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRouting.java
@@ -48,8 +48,11 @@
@Schema(description = "宸ヨ壓璺嚎缂栫爜")
private String processRouteCode;
- @Schema(description = "鍏宠仈bom鐨刬d")
- private Integer bomId;
+ @Schema(description = "鍩虹bom鐨刬d")
+ private Long bomId;
+
+ @Schema(description = "璁㈠崟bom鐨刬d")
+ private Long orderBomId;
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 0a061c0..2a9ffae 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -53,6 +51,9 @@
@Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
+ @Schema(description = "鏄惁鐢熶骇")
+ private Boolean isProduction;
+
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
@@ -60,4 +61,7 @@
@Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String operationName;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index b7809c8..b49e712 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -71,6 +71,9 @@
@Schema(description = "闇�姹傛暟閲�")
private BigDecimal qtyRequired;
+ @Schema(description = "宸蹭笅鍙戞暟閲�")
+ private BigDecimal quantityIssued;
+
@Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
private Boolean issued;
diff --git a/src/main/java/com/ruoyi/production/service/ProductionBomStructureService.java b/src/main/java/com/ruoyi/production/service/ProductionBomStructureService.java
index f94ddec..f102cbd 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionBomStructureService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionBomStructureService.java
@@ -1,7 +1,10 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
import com.ruoyi.production.pojo.ProductionBomStructure;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,6 @@
*/
public interface ProductionBomStructureService extends IService<ProductionBomStructure> {
+ List<ProductionBomStructureVo> listByBomId(Long bomId);
+
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java b/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java
index 42144b3..de011ef 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOrderRoutingService.java
@@ -1,8 +1,8 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo;
import com.ruoyi.production.pojo.ProductionOrderRouting;
-import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import java.util.List;
@@ -10,5 +10,5 @@
ProductionOrderRouting listMain(Long orderId);
- List<ProductionOrderRoutingOperation> listItem(Long orderId);
+ List<ProductionOrderRoutingOperationVo> listItem(Long orderId);
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOrderService.java b/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
index 56779bf..0bd9709 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
@@ -22,4 +22,6 @@
boolean removeProductionOrder(List<Long> ids);
int syncProductionOrderSnapshot(Long productionOrderId);
+
+ Object bindingRoute(ProductionOrderDto productionOrderDto);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
index 5340433..00ab057 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
@@ -1,10 +1,17 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
import com.ruoyi.production.mapper.ProductionBomStructureMapper;
import com.ruoyi.production.pojo.ProductionBomStructure;
import com.ruoyi.production.service.ProductionBomStructureService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -15,6 +22,36 @@
* @since 2026-04-21 03:55:52
*/
@Service
+@RequiredArgsConstructor()
public class ProductionBomStructureServiceImpl extends ServiceImpl<ProductionBomStructureMapper, ProductionBomStructure> implements ProductionBomStructureService {
+ private final ProductionBomStructureMapper productionBomStructureMapper;
+
+ /**
+ * 鏍规嵁BOM鏌ヨ骞剁粍瑁呯粨鏋勬爲銆�
+ */
+ @Override
+ public List<ProductionBomStructureVo> listByBomId(Long bomId) {
+ List<ProductionBomStructureVo> list = productionBomStructureMapper.listByBomId(bomId);
+ Map<Long, ProductionBomStructureVo> map = new HashMap<>();
+ for (ProductionBomStructureVo node : list) {
+ node.setChildren(new ArrayList<>());
+ map.put(node.getId(), node);
+ }
+
+ List<ProductionBomStructureVo> tree = new ArrayList<>();
+ for (ProductionBomStructureVo node : list) {
+ Long parentId = node.getParentId();
+ if (parentId == null || parentId == 0L) {
+ tree.add(node);
+ continue;
+ }
+ ProductionBomStructureVo parent = map.get(parentId);
+ if (parent != null) {
+ parent.getChildren().add(node);
+ }
+ }
+ return tree;
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java
index 41b091b..10443c1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingServiceImpl.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo;
import com.ruoyi.production.mapper.ProductionOrderRoutingMapper;
import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper;
import com.ruoyi.production.pojo.ProductionOrderRouting;
-import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import com.ruoyi.production.service.ProductionOrderRoutingService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -29,11 +29,7 @@
}
@Override
- public List<ProductionOrderRoutingOperation> listItem(Long orderId) {
- return productionOrderRoutingOperationMapper.selectList(
- Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
- .eq(ProductionOrderRoutingOperation::getProductionOrderId, orderId)
- .orderByAsc(ProductionOrderRoutingOperation::getDragSort)
- .orderByAsc(ProductionOrderRoutingOperation::getId));
+ public List<ProductionOrderRoutingOperationVo> listItem(Long orderId) {
+ return productionOrderRoutingOperationMapper.selectVoListByOrderId(orderId);
}
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index 5ec666b..b05665f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -58,6 +58,7 @@
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
+ private final TechnologyOperationMapper technologyOperationMapper;
private final TechnologyBomMapper technologyBomMapper;
private final TechnologyBomStructureMapper technologyBomStructureMapper;
private final FileUtil fileUtil;
@@ -136,20 +137,64 @@
}
@Override
+ public Integer bindingRoute(ProductionOrderDto productionOrderDto) {
+ if (productionOrderDto == null || productionOrderDto.getId() == null) {
+ throw new ServiceException("鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ ProductionOrder productionOrder = this.getById(productionOrderDto.getId());
+ if (productionOrder == null) {
+ throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+
+ Long targetRoutingId = productionOrderDto.getTechnologyRoutingId() == null
+ ? productionOrder.getTechnologyRoutingId()
+ : productionOrderDto.getTechnologyRoutingId();
+ if (targetRoutingId == null) {
+ throw new ServiceException("宸ヨ壓璺嚎ID涓嶈兘涓虹┖");
+ }
+ TechnologyRouting targetRouting = technologyRoutingMapper.selectById(targetRoutingId);
+ if (targetRouting == null) {
+ throw new ServiceException("宸ヨ壓璺嚎涓嶅瓨鍦�");
+ }
+ if (productionOrder.getProductModelId() != null
+ && !Objects.equals(productionOrder.getProductModelId(), targetRouting.getProductModelId())) {
+ throw new ServiceException("宸ヨ壓璺嚎涓庣敓浜ц鍗曚骇鍝佽鏍间笉鍖归厤");
+ }
+
+ if (ProductOrderStatusEnum.isStarted(productionOrder.getStatus())
+ && !Objects.equals(productionOrder.getTechnologyRoutingId(), targetRoutingId)) {
+ throw new ServiceException("鐢熶骇璁㈠崟宸插紑宸ワ紝涓嶈兘淇敼宸ヨ壓璺嚎");
+ }
+
+ if (!Objects.equals(productionOrder.getTechnologyRoutingId(), targetRoutingId)) {
+ ProductionOrder update = new ProductionOrder();
+ update.setId(productionOrder.getId());
+ update.setTechnologyRoutingId(targetRoutingId);
+ if (!this.updateById(update)) {
+ throw new ServiceException("缁戝畾宸ヨ壓璺嚎澶辫触");
+ }
+ }
+
+ // 缁戝畾璺嚎浠呴噸寤鸿鍗曚晶蹇収鏁版嵁
+ return syncProductionOrderSnapshot(productionOrder.getId());
+ }
+
+ @Override
public int syncProductionOrderSnapshot(Long productionOrderId) {
ProductionOrder productionOrder = this.getById(productionOrderId);
if (productionOrder == null) {
- throw new ServiceException("Production order not found");
+ throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
}
if (productionOrder.getTechnologyRoutingId() == null) {
- throw new ServiceException("technologyRoutingId is required");
+ throw new ServiceException("宸ヨ壓璺嚎ID涓嶈兘涓虹┖");
}
TechnologyRouting technologyRouting = technologyRoutingMapper.selectById(productionOrder.getTechnologyRoutingId());
if (technologyRouting == null) {
- throw new ServiceException("Technology routing not found");
+ throw new ServiceException("宸ヨ壓璺嚎涓嶅瓨鍦�");
}
// 璁㈠崟蹇収鎸夆�滃厛娓呭悗寤衡�濆鐞嗭紝淇濊瘉宸ヨ壓璺嚎銆佸伐搴忋�佸弬鏁般�丅OM 鍏ㄩ儴鏉ヨ嚜鍚屼竴鐗堟湰銆�
clearProductionSnapshot(productionOrderId);
+ ProductionOrderBom orderBom = syncProductionOrderBomSnapshot(productionOrder, technologyRouting);
ProductionOrderRouting orderRouting = new ProductionOrderRouting();
orderRouting.setProductionOrderId(productionOrder.getId());
@@ -158,6 +203,7 @@
orderRouting.setProcessRouteCode(technologyRouting.getProcessRouteCode());
orderRouting.setDescription(technologyRouting.getDescription());
orderRouting.setBomId(technologyRouting.getBomId());
+ orderRouting.setOrderBomId(orderBom == null ? null : orderBom.getId());
productionOrderRoutingMapper.insert(orderRouting);
int syncedParamCount = 0;
@@ -166,6 +212,13 @@
.eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId())
.orderByAsc(TechnologyRoutingOperation::getDragSort)
.orderByAsc(TechnologyRoutingOperation::getId));
+ Map<Long, String> operationNameMap = technologyOperationMapper.selectBatchIds(
+ routingOperations.stream()
+ .map(TechnologyRoutingOperation::getTechnologyOperationId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet()))
+ .stream()
+ .collect(Collectors.toMap(TechnologyOperation::getId, TechnologyOperation::getName, (a, b) -> a));
for (TechnologyRoutingOperation sourceOperation : routingOperations) {
// 璁㈠崟宸ュ簭淇濆瓨鐨勬槸宸ヨ壓宸ュ簭蹇収锛屽悗缁姤宸ュ彧渚濊禆蹇収锛屼笉鍐嶇洿鎺ュ紩鐢ㄥ伐鑹轰富鏁版嵁銆�
ProductionOrderRoutingOperation targetOperation = new ProductionOrderRoutingOperation();
@@ -175,6 +228,7 @@
targetOperation.setProductModelId(sourceOperation.getProductModelId());
targetOperation.setDragSort(sourceOperation.getDragSort());
targetOperation.setIsQuality(sourceOperation.getIsQuality());
+ targetOperation.setOperationName(operationNameMap.get(sourceOperation.getTechnologyOperationId()));
productionOrderRoutingOperationMapper.insert(targetOperation);
ProductionOperationTask task = new ProductionOperationTask();
@@ -212,18 +266,17 @@
}
}
- syncProductionOrderBomSnapshot(productionOrder, technologyRouting);
upsertOrderPick(productionOrder);
return syncedParamCount;
}
- private void syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
+ private ProductionOrderBom syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
if (technologyRouting.getBomId() == null) {
- return;
+ return null;
}
TechnologyBom technologyBom = technologyBomMapper.selectById(technologyRouting.getBomId());
if (technologyBom == null) {
- throw new ServiceException("Technology BOM not found");
+ throw new ServiceException("宸ヨ壓BOM涓嶅瓨鍦�");
}
List<TechnologyBomStructure> structureList = technologyBomStructureMapper.selectList(
Wrappers.<TechnologyBomStructure>lambdaQuery()
@@ -257,6 +310,7 @@
productionBomStructureMapper.insert(target);
idMap.put(source.getId(), target.getId());
}
+ return orderBom;
}
private void clearProductionSnapshot(Long productionOrderId) {
@@ -265,7 +319,7 @@
Wrappers.<ProductionOrderPickRecord>lambdaQuery()
.eq(ProductionOrderPickRecord::getProductionOrderId, productionOrderId)) > 0;
if (hasPickRecord) {
- throw new ServiceException("Production order pick records already exist, snapshot cannot be regenerated");
+ throw new ServiceException("鐢熶骇璁㈠崟宸插瓨鍦ㄩ鏂欒褰曪紝涓嶈兘閲嶆柊鐢熸垚蹇収");
}
List<Long> taskIds = productionOperationTaskMapper.selectList(
Wrappers.<ProductionOperationTask>lambdaQuery()
@@ -277,7 +331,7 @@
Wrappers.<ProductionProductMain>lambdaQuery()
.in(ProductionProductMain::getProductionOperationTaskId, taskIds)) > 0;
if (started) {
- throw new ServiceException("Production order already started, snapshot cannot be regenerated");
+ throw new ServiceException("鐢熶骇璁㈠崟宸插紑宸ワ紝涓嶈兘閲嶆柊鐢熸垚蹇収");
}
productionOperationTaskMapper.delete(Wrappers.<ProductionOperationTask>lambdaQuery()
.eq(ProductionOperationTask::getProductionOrderId, productionOrderId));
@@ -350,15 +404,15 @@
private void validateAndFillOrder(ProductionOrder productionOrder, ProductionOrder oldOrder) {
if (productionOrder == null) {
- throw new ServiceException("Production order is required");
+ throw new ServiceException("鐢熶骇璁㈠崟涓嶈兘涓虹┖");
}
fillFromSalesLedgerProduct(productionOrder);
fillFromProductionPlans(productionOrder);
if (productionOrder.getProductModelId() == null) {
- throw new ServiceException("productModelId is required");
+ throw new ServiceException("浜у搧瑙勬牸ID涓嶈兘涓虹┖");
}
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
- throw new ServiceException("quantity must be greater than 0");
+ throw new ServiceException("涓嬪崟鏁伴噺蹇呴』澶т簬0");
}
// if (productionOrder.getTechnologyRoutingId() == null) {
// // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
@@ -368,7 +422,7 @@
// .orderByDesc(TechnologyRouting::getId)
// .last("limit 1"));
// if (technologyRouting == null) {
-// throw new ServiceException("No technology routing found for the product model");
+// throw new ServiceException("鏈壘鍒拌浜у搧瑙勬牸瀵瑰簲鐨勫伐鑹鸿矾绾�");
// }
// productionOrder.setTechnologyRoutingId(technologyRouting.getId());
// }
@@ -377,29 +431,29 @@
if (!Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
|| !Objects.equals(oldOrder.getTechnologyRoutingId(), productionOrder.getTechnologyRoutingId())
|| compareDecimal(oldOrder.getQuantity(), productionOrder.getQuantity()) != 0) {
- throw new ServiceException("Started production orders cannot modify product, routing or quantity");
+ throw new ServiceException("鐢熶骇璁㈠崟宸插紑宸ワ紝涓嶈兘淇敼浜у搧銆佸伐鑹鸿矾绾挎垨鏁伴噺");
}
}
}
private void fillFromSalesLedgerProduct(ProductionOrder productionOrder) {
- if (productionOrder.getSaleLedgerProductId() == null) {
+ if (productionOrder.getSalesLedgerProductId() == null) {
return;
}
// 閿�鍞槑缁嗘槸璁㈠崟鏉ユ簮鏃讹紝浠ラ攢鍞槑缁嗕负鍑嗗洖濉攢鍞彴璐︺�佷骇鍝佽鏍煎拰榛樿鏁伴噺銆�
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productionOrder.getSaleLedgerProductId().longValue());
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productionOrder.getSalesLedgerProductId().longValue());
if (salesLedgerProduct == null) {
- throw new ServiceException("Sales ledger product not found");
+ throw new ServiceException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪");
}
if (productionOrder.getSalesLedgerId() == null) {
productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
} else if (!Objects.equals(productionOrder.getSalesLedgerId(), salesLedgerProduct.getSalesLedgerId())) {
- throw new ServiceException("salesLedgerId does not match the sales ledger product");
+ throw new ServiceException("閿�鍞彴璐D涓庨攢鍞彴璐︿骇鍝佷笉涓�鑷�");
}
if (productionOrder.getProductModelId() == null) {
productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
} else if (!Objects.equals(productionOrder.getProductModelId(), salesLedgerProduct.getProductModelId())) {
- throw new ServiceException("productModelId does not match the sales ledger product");
+ throw new ServiceException("浜у搧瑙勬牸ID涓庨攢鍞彴璐︿骇鍝佷笉涓�鑷�");
}
if (productionOrder.getQuantity() == null || productionOrder.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
productionOrder.setQuantity(salesLedgerProduct.getQuantity());
@@ -420,22 +474,22 @@
// 澶氳鍒掑悎骞惰浆鍗曟椂锛屾墍鏈夎鍒掑繀椤诲睘浜庡悓涓�瑙勬牸锛屼笖鍙兘涓嬪彂涓�娆°��
List<ProductionPlan> productionPlans = productionPlanMapper.selectBatchIds(planIds);
if (productionPlans.size() != planIds.size()) {
- throw new ServiceException("Some production plans do not exist");
+ throw new ServiceException("閮ㄥ垎鐢熶骇璁″垝涓嶅瓨鍦�");
}
Set<Long> productModelIds = productionPlans.stream()
.map(ProductionPlan::getProductModelId)
.collect(Collectors.toSet());
if (productModelIds.size() > 1) {
- throw new ServiceException("Selected production plans must belong to the same product model");
+ throw new ServiceException("鎵�閫夌敓浜ц鍒掑繀椤诲睘浜庡悓涓�浜у搧瑙勬牸");
}
- if (Boolean.TRUE.equals(productionPlans.stream().anyMatch(item -> Boolean.TRUE.equals(item.getIssued())))) {
- throw new ServiceException("Selected production plans already issued");
+ if (productionPlans.stream().anyMatch(item -> item.getStatus() != null && item.getStatus() == 2)) {
+ throw new ServiceException("鎵�閫夌敓浜ц鍒掑凡涓嬪彂");
}
ProductionPlan firstPlan = productionPlans.get(0);
if (productionOrder.getProductModelId() == null) {
productionOrder.setProductModelId(firstPlan.getProductModelId());
} else if (!Objects.equals(productionOrder.getProductModelId(), firstPlan.getProductModelId())) {
- throw new ServiceException("productModelId does not match the production plans");
+ throw new ServiceException("浜у搧瑙勬牸ID涓庣敓浜ц鍒掍笉涓�鑷�");
}
if (productionOrder.getQuantity() == null || productionOrder.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
productionOrder.setQuantity(productionPlans.stream()
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
index 597ed34..5fba66d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -73,31 +73,30 @@
throw new ServiceException("涓嬪彂澶辫触锛屾湭閫夋嫨鐢熶骇璁″垝");
}
- List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(planIds);
- if (plans == null || plans.isEmpty() || plans.size() != planIds.size()) {
+ List<ProductionPlanDto> planLists = productionPlanMapper.selectWithMaterialByIds(planIds);
+ if (planLists == null || planLists.isEmpty() || planLists.size() != planIds.size()) {
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掍笉瀛樺湪鎴栧凡琚垹闄�");
}
- ProductionPlanDto firstPlan = plans.getFirst();
+ ProductionPlanDto firstPlan = planLists.getFirst();
if (firstPlan.getProductModelId() == null) {
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掔己灏戜骇鍝佸瀷鍙�");
}
- boolean hasDifferentModel = plans.stream()
+ boolean hasDifferentModel = planLists.stream()
.anyMatch(item -> !Objects.equals(item.getProductModelId(), firstPlan.getProductModelId()));
if (hasDifferentModel) {
throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掔殑浜у搧鍨嬪彿涓嶄竴鑷�");
}
- boolean hasIssuedPlan = plans.stream()
- .anyMatch(item -> item.getStatus() != null && item.getStatus() != PLAN_STATUS_WAIT);
+ boolean hasIssuedPlan = planLists.stream()
+ .anyMatch(item -> item.getStatus() != null && item.getStatus() == PLAN_STATUS_ISSUED);
if (hasIssuedPlan) {
throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掑瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戞暟鎹�");
}
- BigDecimal totalRequiredQuantity = plans.stream()
- .map(ProductionPlan::getQtyRequired)
- .filter(Objects::nonNull)
+ BigDecimal totalRequiredQuantity = planLists.stream()
+ .map(this::resolveRemainingQuantity)
.reduce(BigDecimal.ZERO, BigDecimal::add);
if (totalRequiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("涓嬪彂澶辫触锛屾墍閫夌敓浜ц鍒掗渶姹傛�婚噺蹇呴』澶т簬0");
@@ -111,8 +110,25 @@
throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庤鍒掗渶姹傛�婚噺");
}
+ BigDecimal remainingForOrderBind = assignedQuantity;
+ List<Long> issuedPlanIds = new ArrayList<>();
+ for (ProductionPlanDto plan : planLists) {
+ BigDecimal remainingQuantity = resolveRemainingQuantity(plan);
+ if (remainingForOrderBind.compareTo(BigDecimal.ZERO) <= 0 || remainingQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ BigDecimal issueForThisPlan = remainingForOrderBind.min(remainingQuantity);
+ remainingForOrderBind = remainingForOrderBind.subtract(issueForThisPlan);
+ if (issueForThisPlan.compareTo(BigDecimal.ZERO) > 0) {
+ issuedPlanIds.add(plan.getId());
+ }
+ }
+ if (issuedPlanIds.isEmpty()) {
+ throw new ServiceException("Issue failed, no quantity available for dispatch");
+ }
+
ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setProductionPlanIds(formatPlanIds(planIds));
+ productionOrder.setProductionPlanIds(formatPlanIds(issuedPlanIds));
productionOrder.setProductModelId(firstPlan.getProductModelId());
productionOrder.setQuantity(assignedQuantity);
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
@@ -122,13 +138,31 @@
throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍗曚繚瀛樺け璐�");
}
- int targetStatus = assignedQuantity.compareTo(totalRequiredQuantity) < 0 ? PLAN_STATUS_PARTIAL : PLAN_STATUS_ISSUED;
- List<ProductionPlan> updates = planIds.stream().map(id -> {
+ //宸蹭笅鍙戞暟閲�
+ BigDecimal remainingAssignedQuantity = assignedQuantity;
+ List<ProductionPlan> updates = new ArrayList<>();
+ for (ProductionPlanDto plan : planLists) {
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) < 0) {
+ requiredQuantity = BigDecimal.ZERO;
+ }
+ BigDecimal remainingQuantity = resolveRemainingQuantity(plan);
+ BigDecimal historicalIssuedQuantity = requiredQuantity.subtract(remainingQuantity);
+ BigDecimal issuedQuantity = BigDecimal.ZERO;
+ if (remainingAssignedQuantity.compareTo(BigDecimal.ZERO) > 0 && remainingQuantity.compareTo(BigDecimal.ZERO) > 0) {
+ issuedQuantity = remainingAssignedQuantity.min(remainingQuantity);
+ remainingAssignedQuantity = remainingAssignedQuantity.subtract(issuedQuantity);
+ }
+
+ BigDecimal totalIssuedQuantity = historicalIssuedQuantity.add(issuedQuantity);
+ int planStatus = resolvePlanStatus(requiredQuantity, totalIssuedQuantity);
ProductionPlan update = new ProductionPlan();
- update.setId(id);
- update.setStatus(targetStatus);
- return update;
- }).collect(Collectors.toList());
+ update.setId(plan.getId());
+ update.setStatus(planStatus);
+ update.setQuantityIssued(totalIssuedQuantity);
+ update.setIssued(planStatus == PLAN_STATUS_ISSUED);
+ updates.add(update);
+ }
if (!updates.isEmpty()) {
this.updateBatchById(updates);
}
@@ -261,6 +295,34 @@
util.exportExcel(response, exportList, "涓荤敓浜ц鍒�");
}
+ private BigDecimal resolveRemainingQuantity(ProductionPlan plan) {
+ if (plan == null) {
+ return BigDecimal.ZERO;
+ }
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return BigDecimal.ZERO;
+ }
+ BigDecimal issuedQuantity = Optional.ofNullable(plan.getQuantityIssued()).orElse(BigDecimal.ZERO);
+ if (issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return requiredQuantity;
+ }
+ if (issuedQuantity.compareTo(requiredQuantity) >= 0) {
+ return BigDecimal.ZERO;
+ }
+ return requiredQuantity.subtract(issuedQuantity);
+ }
+
+ private int resolvePlanStatus(BigDecimal requiredQuantity, BigDecimal issuedQuantity) {
+ if (requiredQuantity == null || requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return PLAN_STATUS_WAIT;
+ }
+ if (issuedQuantity == null || issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return PLAN_STATUS_WAIT;
+ }
+ return issuedQuantity.compareTo(requiredQuantity) < 0 ? PLAN_STATUS_PARTIAL : PLAN_STATUS_ISSUED;
+ }
+
private String formatPlanIds(List<Long> planIds) {
return planIds.stream()
.filter(Objects::nonNull)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index ff43daf..24c06d7 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -246,7 +246,7 @@
ProductionAccount productionAccount = new ProductionAccount();
productionAccount.setProductionProductMainId(productionProductMain.getId());
productionAccount.setSalesLedgerId(productionOrder.getSalesLedgerId());
- productionAccount.setSalesLedgerProductId(productionOrder.getSaleLedgerProductId() == null ? null : productionOrder.getSaleLedgerProductId().longValue());
+ productionAccount.setSalesLedgerProductId(productionOrder.getSalesLedgerProductId() == null ? null : productionOrder.getSalesLedgerProductId().longValue());
productionAccount.setSchedulingUserId(user == null ? null : user.getUserId());
productionAccount.setSchedulingUserName(user == null ? dto.getUserName() : user.getNickName());
productionAccount.setFinishedNum(productQty);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index cf333a2..98f03b4 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -211,7 +211,6 @@
result = salesLedgerProductMapper.updateById(salesLedgerProduct);
/*鍒犻櫎瀵瑰簲鐨勭敓浜ф暟鎹苟閲嶆柊鏂板*/
deleteProductionData(Arrays.asList(salesLedgerProduct.getId()));
- // 鍒犻櫎鐢熶骇鏍哥畻鏁版嵁
addProductionData(salesLedgerProduct);
}
@@ -273,7 +272,7 @@
List<ProductionPlan> productionPlans = productionPlanMapper.selectList(
new LambdaQueryWrapper<ProductionPlan>()
.in(ProductionPlan::getSalesLedgerProductId, productIds.stream().map(Long::intValue).collect(Collectors.toList())));
- if (org.springframework.util.CollectionUtils.isEmpty(productionPlans)) {
+ if (CollectionUtils.isEmpty(productionPlans)) {
return;
}
//濡傛灉鐢熶骇璁″垝宸蹭笅鍙戝垯涓嶈兘鍒犻櫎
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java
index b95c3a7..3d9048e 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyBomStructureController.java
@@ -27,7 +27,7 @@
@GetMapping("/listByBomId/{bomId}")
@Operation(summary = "鏍规嵁BOM鏌ヨ缁撴瀯鏍�")
- public R<List<TechnologyBomStructureVo>> listByBomId(@PathVariable("bomId") Long bomId) {
+ public R<List<TechnologyBomStructureVo>> listByBomId(@PathVariable Long bomId) {
return R.ok(technologyBomStructureService.listByBomId(bomId));
}
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
index 503f171..f7fc0d6 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
@@ -43,7 +43,7 @@
/**
* 鏂板宸ヨ壓璺嚎銆�
*/
- @PostMapping
+ @PostMapping("/addTechRoute")
@Operation(summary = "鏂板宸ヨ壓璺嚎")
public R add(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.saveTechnologyRouting(technologyRouting));
@@ -52,7 +52,7 @@
/**
* 淇敼宸ヨ壓璺嚎銆�
*/
- @PutMapping
+ @PutMapping("editTechRoute")
@Operation(summary = "淇敼宸ヨ壓璺嚎")
public R edit(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
index 0d1c99d..133670f 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyBomStructure.java
@@ -17,7 +17,7 @@
*/
@Data
@TableName("technology_bom_structure")
-@Schema(name = "TechnologyBomStructure瀵硅薄", description = "BOM浜у搧缁撴瀯琛�")
+@Schema(name = "TechnologyStructure瀵硅薄", description = "BOM浜у搧缁撴瀯琛�")
public class TechnologyBomStructure implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java
index 31dab52..1427de6 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRouting.java
@@ -43,7 +43,7 @@
private String processRouteCode;
@Schema(description = "鍏宠仈bom鐨刬d")
- private Integer bomId;
+ private Long bomId;
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
index 3707062..f91f1e1 100644
--- a/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
+++ b/src/main/java/com/ruoyi/technology/pojo/TechnologyRoutingOperation.java
@@ -48,6 +48,9 @@
@Schema(description = "鏄惁璐ㄦ宸ュ簭")
private Boolean isQuality;
+ @Schema(description = "鏄惁鐢熶骇")
+ private Boolean isProduction;
+
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
diff --git a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
index a58e90f..355151a 100644
--- a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
+++ b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
@@ -27,7 +27,7 @@
from sales_refund_amount_order srao
left join return_management rm on srao.return_management_id = rm.id
left join return_sale_product rs on rm.id = rs.return_management_id
- left join sales_ledger_product slp on rs.return_sale_ledger_product_id = slp.id
+ left join sales_ledger_product slp on rs.return_sales_ledger_product_id = slp.id
left join sales_ledger sl on slp.sales_ledger_id = sl.id
<where>
<if test="ew.salesContractNo != null and ew.salesContractNo !=''">
diff --git a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
index 71d38ea..55cba43 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.procurementrecord.pojo.ReturnSaleProduct">
<id column="id" property="id" />
<result column="return_management_id" property="returnManagementId" />
- <result column="return_sale_ledger_product_id" property="returnSaleLedgerProductId" />
+ <result column="return_sales_ledger_product_id" property="returnsalesLedgerProductId" />
<result column="num" property="num" />
<result column="status" property="status" />
</resultMap>
@@ -21,18 +21,18 @@
LEFT JOIN return_management rm ON rm.id = rsp.return_management_id
LEFT JOIN shipping_info si ON si.id = rm.shipping_id
LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id and slp.type = 1
- LEFT JOIN (SELECT return_sale_ledger_product_id,
+ LEFT JOIN (SELECT return_sales_ledger_product_id,
SUM(num) AS total_return_num
FROM return_sale_product
WHERE 1 = 1 and return_management_id != #{returnManagementId}
- GROUP BY return_sale_ledger_product_id) rs ON rs.return_sale_ledger_product_id = slp.id
+ GROUP BY return_sales_ledger_product_id) rs ON rs.return_sales_ledger_product_id = slp.id
where rm.id =#{returnManagementId}
</select>
<select id="listReturnSaleProduct" resultType="com.ruoyi.procurementrecord.dto.ReturnSaleProductDto">
select rsp.*,slp.tax_inclusive_unit_price ,slp.tax_inclusive_total_price*rsp.num as price
from return_sale_product rsp
- left join sales_ledger_product slp on slp.id = rsp.return_sale_ledger_product_id
+ left join sales_ledger_product slp on slp.id = rsp.return_sales_ledger_product_id
where rsp.return_management_id = #{returnManagementId}
</select>
diff --git a/src/main/resources/mapper/production/ProductionBomStructureMapper.xml b/src/main/resources/mapper/production/ProductionBomStructureMapper.xml
index 1f70c48..13b534f 100644
--- a/src/main/resources/mapper/production/ProductionBomStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductionBomStructureMapper.xml
@@ -17,4 +17,18 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="listByBomId" resultType="com.ruoyi.production.bean.vo.ProductionBomStructureVo">
+ select pbs.*,
+ p.product_name as productName,
+ pm.product_id as productId,
+ pm.model,
+ top1.name as operationName
+ from production_bom_structure pbs
+ left join product_model pm on pbs.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_operation top1 on pbs.technology_operation_id = top1.id
+ where pbs.production_order_bom_id = #{bomId}
+ order by pbs.id
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index b2f895d..40af51d 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -16,7 +16,7 @@
<result column="complete_quantity" property="completeQuantity" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
- <result column="sale_ledger_product_id" property="saleLedgerProductId" />
+ <result column="sales_ledger_product_id" property="salesLedgerProductId" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
<result column="plan_complete_time" property="planCompleteTime" />
@@ -44,7 +44,7 @@
po.complete_quantity,
po.start_time,
po.end_time,
- po.sale_ledger_product_id,
+ po.sales_ledger_product_id,
po.create_user,
po.dept_id,
po.plan_complete_time,
@@ -53,7 +53,8 @@
sl.customer_name as customerName,
p.product_name as productName,
pm.model as model,
- tr.process_route_code as processRouteCode
+ tr.process_route_code as processRouteCode,
+ tb.bom_no as bomNo
</sql>
<sql id="ProductionOrderVoFrom">
@@ -62,6 +63,7 @@
left join product_model pm on po.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join technology_routing tr on po.technology_routing_id = tr.id
+ left join technology_bom tb on tb.id = tr.bom_id
</sql>
<sql id="ProductionOrderWhere">
@@ -79,8 +81,8 @@
<if test="c.technologyRoutingId != null">
and po.technology_routing_id = #{c.technologyRoutingId}
</if>
- <if test="c.saleLedgerProductId != null">
- and po.sale_ledger_product_id = #{c.saleLedgerProductId}
+ <if test="c.salesLedgerProductId != null">
+ and po.sales_ledger_product_id = #{c.salesLedgerProductId}
</if>
<if test="c.status != null">
and po.status = #{c.status}
diff --git a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
index d47c4e9..7bfc539 100644
--- a/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderRoutingOperationMapper.xml
@@ -17,4 +17,26 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <resultMap id="OperationVoResultMap" type="com.ruoyi.production.bean.vo.ProductionOrderRoutingOperationVo" extends="BaseResultMap">
+ <result column="technologyOperationId" property="technologyOperationId" />
+ <result column="productName" property="productName" />
+ <result column="model" property="model" />
+ <result column="unit" property="unit" />
+ </resultMap>
+
+ <select id="selectVoListByOrderId" resultMap="OperationVoResultMap">
+ SELECT
+ poro.*,
+ tro.technology_operation_id AS technologyOperationId,
+ p.product_name AS productName,
+ pm.model AS model,
+ pm.unit AS unit
+ FROM production_order_routing_operation poro
+ LEFT JOIN technology_routing_operation tro ON poro.technology_routing_operation_id = tro.id
+ LEFT JOIN product_model pm ON poro.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ WHERE poro.production_order_id = #{orderId}
+ ORDER BY poro.drag_sort ASC, poro.id ASC
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index d19895b..251cf64 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -31,7 +31,7 @@
left join production_product_main ppm on qi.product_main_id = ppm.id
left join product_work_order pwo on ppm.work_order_id = pwo.id
left join product_order po on pwo.product_order_id = po.id
- left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id and slp.type = 1
+ left join sales_ledger_product slp on po.sales_ledger_product_id = slp.id and slp.type = 1
where qi.product_main_id = #{productMainId}
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 82c67b2..71bce20 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -67,14 +67,14 @@
LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id and slp.type = 1
LEFT JOIN (
SELECT
- return_sale_ledger_product_id,
+ return_sales_ledger_product_id,
SUM(num) AS total_return_num
FROM return_sale_product rsp
left join return_management rm on rm.id = rsp.return_management_id
left join shipping_info si on si.id = rm.shipping_id
WHERE 1=1
- GROUP BY return_sale_ledger_product_id
- ) rs ON rs.return_sale_ledger_product_id = slp.id
+ GROUP BY return_sales_ledger_product_id
+ ) rs ON rs.return_sales_ledger_product_id = slp.id
<where>
<if test="shippingId != null">
si.id = #{shippingId}
@@ -86,4 +86,4 @@
left join sales_ledger sl on si.sales_ledger_id = sl.id
where si.status = '宸插彂璐�' and sl.customer_name = #{customerName}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
index 231905b..6287d37 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
@@ -16,17 +16,17 @@
<select id="pageTechnologyRouting" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingVo">
select tr.id,
- tr.product_model_id as productModelId,
- tr.description,
- tr.create_time as createTime,
- tr.update_time as updateTime,
- tr.process_route_code as processRouteCode,
- tr.bom_id as bomId,
- tr.create_user as createUser,
- tr.dept_id as deptId,
- p.product_name as productName,
- pm.model,
- tb.bom_no as bomNo
+ tr.product_model_id as productModelId,
+ tr.description,
+ tr.create_time as createTime,
+ tr.update_time as updateTime,
+ tr.process_route_code as processRouteCode,
+ tr.bom_id as bomId,
+ tr.create_user as createUser,
+ tr.dept_id as deptId,
+ p.product_name as productName,
+ pm.model,
+ tb.bom_no as bomNo
from technology_routing tr
left join product_model pm on tr.product_model_id = pm.id
left join product p on pm.product_id = p.id
@@ -47,15 +47,6 @@
</if>
<if test="c.description != null and c.description != ''">
and tr.description like concat('%', #{c.description}, '%')
- </if>
- <if test="c.model != null and c.model != ''">
- and pm.model like concat('%', #{c.model}, '%')
- </if>
- <if test="c.productName != null and c.productName != ''">
- and p.product_name like concat('%', #{c.productName}, '%')
- </if>
- <if test="c.bomNo != null and c.bomNo != ''">
- and tb.bom_no like concat('%', #{c.bomNo}, '%')
</if>
</if>
</where>
--
Gitblit v1.9.3