From 352a6420c3241955abd26aaaad997fdc65ffdb3a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 14:27:32 +0800
Subject: [PATCH] feat: 销售订单绑定工艺路线
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProcessRouteServiceImpl.java | 22 +++
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 3
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java | 59 ++++++++
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 3
src/main/java/com/ruoyi/sales/service/ISalesLedgerProcessRouteService.java | 16 ++
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 6
doc/河南鹤壁天沐钢化玻璃厂.sql | 15 ++
src/main/resources/mapper/sales/SalesLedgerProcessRouteMapper.xml | 17 ++
src/main/java/com/ruoyi/production/controller/ProcessRouteController.java | 7 +
src/main/resources/mapper/production/ProcessRouteMapper.xml | 26 +--
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 21 ++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 38 +++++
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 20 --
src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java | 9
src/main/java/com/ruoyi/sales/mapper/SalesLedgerProcessRouteMapper.java | 16 ++
src/main/java/com/ruoyi/production/service/ProcessRouteService.java | 2
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 39 +++++
src/main/java/com/ruoyi/sales/controller/SalesLedgerProcessRouteController.java | 21 +++
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 24 +-
19 files changed, 305 insertions(+), 59 deletions(-)
diff --git "a/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql" "b/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
index 0646d58..bfad117 100644
--- "a/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
+++ "b/doc/\346\262\263\345\215\227\351\271\244\345\243\201\345\244\251\346\262\220\351\222\242\345\214\226\347\216\273\347\222\203\345\216\202.sql"
@@ -48,4 +48,17 @@
MODIFY COLUMN `settle_piece_area` decimal(20, 15) NULL DEFAULT NULL COMMENT '缁撶畻鍗曠墖闈㈢Н(銕�)' AFTER `actual_total_area`,
MODIFY COLUMN `settle_total_area` decimal(20, 15) NULL DEFAULT NULL COMMENT '缁撶畻鎬婚潰绉�(銕�)' AFTER `settle_piece_area`,
ADD COLUMN `perimeter` decimal(20, 15) NULL COMMENT '鍛ㄩ暱' AFTER `settle_total_area`,
- ADD COLUMN `heavy_box` decimal(20, 15) NULL COMMENT '閲嶇' AFTER `perimeter`;
\ No newline at end of file
+ ADD COLUMN `heavy_box` decimal(20, 15) NULL COMMENT '閲嶇' AFTER `perimeter`;
+
+ALTER TABLE `product-inventory-management-hbtmblc`.`process_route`
+ MODIFY COLUMN `product_model_id` bigint NULL DEFAULT 0 COMMENT '浜у搧id' AFTER `id`,
+ MODIFY COLUMN `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '鎻忚堪' AFTER `product_model_id`,
+ ADD COLUMN `is_default` tinyint(1) NULL COMMENT '鏄惁榛樿(0-鍚�,1-鏄�)' AFTER `bom_id`;
+
+ALTER TABLE `product-inventory-management-hbtmblc`.`process_route`
+ ADD COLUMN `process_route_name` varchar(255) NULL COMMENT '宸ヨ壓璺嚎鍚嶇О' AFTER `product_model_id`;
+
+ALTER TABLE `product-inventory-management-hbtmblc`.`process_route_item`
+ MODIFY COLUMN `product_model_id` bigint NULL DEFAULT 0 COMMENT '浜у搧id' AFTER `route_id`,
+ MODIFY COLUMN `process_id` bigint NULL DEFAULT 0 COMMENT '宸ュ簭id' AFTER `product_model_id`,
+ ADD COLUMN `process_name` varchar(255) NULL COMMENT '宸ュ簭鍚嶇О' AFTER `process_id`;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
index 50ac4a8..26845ae 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
@@ -44,4 +44,11 @@
public R delete(@PathVariable("ids") Long[] ids) {
return R.ok(processRouteService.batchDelete(Arrays.asList(ids)));
}
+
+ @ApiOperation("榛樿宸ヨ壓璺嚎")
+ @PutMapping("/default/{id}")
+ public R updateDefault(@PathVariable("id") Long id) {
+ processRouteService.updateDefault(id);
+ return R.ok();
+ }
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index 705354c..2319afd 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -9,9 +9,6 @@
@Data
public class ProcessRouteItemDto extends ProcessRouteItem {
- @ApiModelProperty(value = "宸ュ簭鍚嶇О")
- private String processName;
-
@ApiModelProperty(value = "宸ヨ壓璺嚎鍚嶇О")
private String routeName;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index fe661b3..6b8d2dc 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -24,6 +24,12 @@
@ApiModelProperty(value = "鎻忚堪")
private String description;
+ @ApiModelProperty(value = "宸ヨ壓璺嚎鍚嶇О")
+ private String processRouteName;
+
+ @ApiModelProperty(value = "鏄惁榛樿(0-鍚�,1-鏄�)")
+ private Integer isDefault;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
index 973b29e..aaa6dc3 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
@@ -21,8 +21,11 @@
@ApiModelProperty(value = "宸ュ簭id")
private Long processId;
- @ApiModelProperty(value ="浜у搧id")
+ @ApiModelProperty(value = "浜у搧id")
private Long productModelId;
+
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ private String processName;
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
@@ -34,11 +37,11 @@
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value ="鎷栧姩鎺掑簭")
+ @ApiModelProperty(value = "鎷栧姩鎺掑簭")
private Integer dragSort;
- @ApiModelProperty(value ="鏄惁璐ㄦ")
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
private Boolean isQuality;
}
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
index 6b408cf..a31def1 100644
--- a/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
@@ -16,4 +16,6 @@
Integer saveProcessRoute(ProcessRoute processRoute);
int batchDelete(List<Long> ids);
+
+ void updateDefault(Long id);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
index 5614366..8dda3da 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -21,11 +21,11 @@
public class ProcessRouteItemServiceImpl extends ServiceImpl<ProcessRouteItemMapper, ProcessRouteItem> implements ProcessRouteItemService {
@Autowired
- private ProcessRouteItemMapper processRouteItemMapper;
+ private ProcessRouteItemMapper processRouteItemMapper;
@Override
public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
- return processRouteItemMapper.listProcessRouteItemDto( processRouteItemDto);
+ return processRouteItemMapper.listProcessRouteItemDto(processRouteItemDto);
}
//鎺掑簭
@@ -42,14 +42,14 @@
if (targetPosition != null && targetPosition >= 0) {
// 绉诲姩鍏冪礌鍒版柊鐨勪綅缃�
processRouteItems.remove(oldProcessRouteItem);
- processRouteItems.add(targetPosition-1, oldProcessRouteItem);
+ processRouteItems.add(targetPosition - 1, oldProcessRouteItem);
// 鏇存柊鎵�鏈夊彈褰卞搷鐨勬帓搴忓瓧娈�
for (int i = 0; i < processRouteItems.size(); i++) {
ProcessRouteItem item = processRouteItems.get(i);
if (!item.getId().equals(oldProcessRouteItem.getId())) {
// 妫�鏌ユ槸鍚﹂渶瑕佹洿鏂版帓搴忓��
- if (item.getDragSort() != i+1) {
- item.setDragSort(i+1);
+ if (item.getDragSort() != i + 1) {
+ item.setDragSort(i + 1);
processRouteItemMapper.updateById(item);
}
} else {
@@ -78,13 +78,13 @@
.eq(ProcessRouteItem::getRouteId, routeId)
.orderByAsc(ProcessRouteItem::getDragSort));
// 閲嶆柊璁剧疆鎺掑簭鍊硷紝浣垮簭鍙疯繛缁�
- for (int i = 0; i < processRouteItems.size(); i++) {
- ProcessRouteItem item = processRouteItems.get(i);
- if (!item.getDragSort().equals(i+1)) {
- item.setDragSort(i+1);
- processRouteItemMapper.updateById(item);
- }
- }
+// for (int i = 0; i < processRouteItems.size(); i++) {
+// ProcessRouteItem item = processRouteItems.get(i);
+// if (!item.getDragSort().equals(i+1)) {
+// item.setDragSort(i+1);
+// processRouteItemMapper.updateById(item);
+// }
+// }
return "鍒犻櫎鎴愬姛";
}
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index b3beded..39195ff 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -1,9 +1,12 @@
package com.ruoyi.production.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProcessRouteDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProcessRouteMapper;
@@ -14,6 +17,9 @@
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.pojo.ProductProcessRoute;
import com.ruoyi.production.service.ProcessRouteService;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import com.ruoyi.sales.service.ISalesLedgerProcessRouteService;
+import com.ruoyi.sales.service.ISalesLedgerProductProcessService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +35,9 @@
@AllArgsConstructor
@Slf4j
public class ProcessRouteServiceImpl extends ServiceImpl<ProcessRouteMapper, ProcessRoute> implements ProcessRouteService {
+
+ @Autowired
+ private ISalesLedgerProcessRouteService salesLedgerProcessRouteService;
@Autowired
private ProcessRouteMapper processRouteMapper;
@@ -47,6 +56,12 @@
@Override
public Integer saveProcessRoute(ProcessRoute processRoute) {
+ if (processRoute == null) {
+ throw new ServiceException("宸ヨ壓璺嚎鏂板澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isEmpty(processRoute.getProcessRouteName())) {
+ throw new ServiceException("宸ヨ壓璺嚎鏂板澶辫触,鍚嶇О涓嶈兘涓虹┖");
+ }
this.save(processRoute);
String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String idStr = String.format("%06d", processRoute.getId());
@@ -59,12 +74,30 @@
@Override
public int batchDelete(List<Long> ids) {
//鍏堝垽鏂槸鍚﹀凡缁忓紩鐢ㄤ簡
- List<ProductOrder> productOrders = productOrderMapper.selectList(Wrappers.<ProductOrder>lambdaQuery().in(ProductOrder::getRouteId, ids));
- if (productOrders.size()>0){
- throw new RuntimeException("璇ュ伐鑹鸿矾绾跨敓浜у凡寮曠敤锛屼笉鑳藉垹闄�");
+ List<SalesLedgerProcessRoute> list = salesLedgerProcessRouteService.list(new LambdaQueryWrapper<SalesLedgerProcessRoute>().in(SalesLedgerProcessRoute::getProcessRouteId, ids));
+ if (list != null && list.size() > 0) {
+ throw new ServiceException("璇ュ伐鑹鸿矾绾垮凡琚紩鐢ㄤ笉鑳藉垹闄�");
}
//鍒犻櫎宸ヨ壓璺嚎璇︽儏
processRouteItemMapper.delete(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getRouteId, ids));
return processRouteMapper.deleteBatchIds(ids);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateDefault(Long id) {
+ ProcessRoute currentRoute = this.getById(id);
+ if (currentRoute == null) {
+ throw new ServiceException("宸ヨ壓璺嚎涓嶅瓨鍦�");
+ }
+ if (Integer.valueOf(1).equals(currentRoute.getIsDefault())) {
+ return;
+ }
+ this.update(Wrappers.<ProcessRoute>lambdaUpdate()
+ .set(ProcessRoute::getIsDefault, 0)
+ .eq(ProcessRoute::getIsDefault, 1));
+ this.update(Wrappers.<ProcessRoute>lambdaUpdate()
+ .set(ProcessRoute::getIsDefault, 1)
+ .eq(ProcessRoute::getId, id));
+ }
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index cbef46f..1cf2d74 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -17,6 +17,7 @@
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
@@ -120,12 +121,12 @@
startPage();
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
// 璁＄畻宸插紑绁ㄩ噾棰�/鏈紑绁ㄩ噾棰�(宸插～鍐欏彂绁ㄩ噾棰濅负鍑�)
- if(CollectionUtils.isEmpty(list)){
+ if (CollectionUtils.isEmpty(list)) {
return getDataTable(list);
}
List<Long> salesLedgerIds = list.stream().map(SalesLedger::getId).collect(Collectors.toList());
List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
- if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
+ if (CollectionUtils.isEmpty(invoiceLedgerDtoList)) {
return getDataTable(list);
}
for (SalesLedger salesLedger : list) {
@@ -154,10 +155,10 @@
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
- Page page = new Page(-1,-1);
+ Page page = new Page(-1, -1);
IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
- if(salesLedgerIPage == null){
+ if (salesLedgerIPage == null) {
util.exportExcel(response, new ArrayList<>(), "閿�鍞彴璐︽暟鎹�");
return;
}
@@ -186,6 +187,16 @@
@PostMapping("/addOrUpdateSalesLedger")
public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
+ }
+
+ /**
+ * 閿�鍞鍗曠粦瀹氬伐鑹鸿矾绾�
+ */
+ @PostMapping("/saleProcessBind")
+ @ApiOperation("閿�鍞鍗曠粦瀹氬伐鑹鸿矾绾�")
+ public AjaxResult saleProcessBind(@RequestBody SalesLedgerProcessRoute salesLedgerProcessRoute) {
+ salesLedgerService.saleProcessBind(salesLedgerProcessRoute);
+ return AjaxResult.success();
}
/**
@@ -249,7 +260,7 @@
* 杩戝崐骞村紑绁�,鍥炴閲戦
*/
@GetMapping("/getAmountHalfYear")
- public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+ public AjaxResult getAmountHalfYear(@RequestParam(value = "type", defaultValue = "1") Integer type) {
return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProcessRouteController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProcessRouteController.java
new file mode 100644
index 0000000..9f23a36
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProcessRouteController.java
@@ -0,0 +1,21 @@
+package com.ruoyi.sales.controller;
+
+
+import io.swagger.annotations.ApiModel;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-03-26
+ */
+@RestController
+@RequestMapping("/salesLedgerProcessRoute")
+@ApiModel(value = "SalesLedgerProcessRouteController", description = "閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎")
+public class SalesLedgerProcessRouteController {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerProcessRouteMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerProcessRouteMapper.java
new file mode 100644
index 0000000..97c64bc
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerProcessRouteMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.sales.mapper;
+
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-03-26
+ */
+public interface SalesLedgerProcessRouteMapper extends BaseMapper<SalesLedgerProcessRoute> {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
new file mode 100644
index 0000000..02197cf
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
@@ -0,0 +1,59 @@
+package com.ruoyi.sales.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sales_ledger_process_route")
+@ApiModel(value = "SalesLedgerProcessRoute瀵硅薄", description = "閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎")
+public class SalesLedgerProcessRoute implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "閿�鍞彴璐D")
+ private Long salesLedgerId;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎ID")
+ private Long processRouteId;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鎷栧姩鎺掑簭")
+ private Integer dragSort;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎鑺傜偣ID")
+ private Long processRouteItemId;
+
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerProcessRouteService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerProcessRouteService.java
new file mode 100644
index 0000000..36f07ce
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerProcessRouteService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.sales.service;
+
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎 鏈嶅姟绫�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-03-26
+ */
+public interface ISalesLedgerProcessRouteService extends IService<SalesLedgerProcessRoute> {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index eda9da4..dbacb6c 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -10,6 +10,7 @@
import com.ruoyi.sales.dto.MonthlyAmountDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import org.springframework.web.multipart.MultipartFile;
@@ -54,4 +55,6 @@
List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);
IPage<SalesLedgerDto> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page);
+
+ void saleProcessBind(SalesLedgerProcessRoute salesLedgerProcessRoute);
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProcessRouteServiceImpl.java
new file mode 100644
index 0000000..1ef03be
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProcessRouteServiceImpl.java
@@ -0,0 +1,22 @@
+package com.ruoyi.sales.service.impl;
+
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import com.ruoyi.sales.mapper.SalesLedgerProcessRouteMapper;
+import com.ruoyi.sales.service.ISalesLedgerProcessRouteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-03-26
+ */
+@Slf4j
+@Service
+public class SalesLedgerProcessRouteServiceImpl extends ServiceImpl<SalesLedgerProcessRouteMapper, SalesLedgerProcessRoute> implements ISalesLedgerProcessRouteService {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index c73e1ea..991d011 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.SaleEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EnumUtil;
@@ -26,6 +27,8 @@
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
@@ -37,6 +40,7 @@
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
+import com.ruoyi.sales.service.ISalesLedgerProcessRouteService;
import com.ruoyi.sales.service.ISalesLedgerProductProcessBindService;
import com.ruoyi.sales.service.ISalesLedgerProductProcessService;
import com.ruoyi.sales.service.ISalesLedgerService;
@@ -116,6 +120,8 @@
private final ISalesLedgerProductProcessService salesLedgerProductProcessService;
private final ISalesLedgerProductProcessBindService salesLedgerProductProcessBindService;
+
+ private final ISalesLedgerProcessRouteService salesLedgerProcessRouteService;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -521,6 +527,38 @@
return salesLedgerDtoIPage;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saleProcessBind(SalesLedgerProcessRoute salesLedgerProcessRoute) {
+ if (salesLedgerProcessRoute == null) {
+ throw new ServiceException("缁戝畾澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ SalesLedger salesLedger = baseMapper.selectById(salesLedgerProcessRoute.getSalesLedgerId());
+ if (salesLedger == null) {
+ throw new ServiceException("缁戝畾澶辫触,閿�鍞鍗曚笉瀛樺湪");
+ }
+ ProcessRoute processRoute = processRouteMapper.selectById(salesLedgerProcessRoute.getProcessRouteId());
+ if (processRoute == null) {
+ throw new ServiceException("缁戝畾澶辫触,宸ヨ壓璺嚎涓嶅瓨鍦�");
+ }
+ // 娓呴櫎宸茬粦瀹氱殑鏁版嵁
+ salesLedgerProcessRouteService.remove(new LambdaQueryWrapper<SalesLedgerProcessRoute>().eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId()).eq(SalesLedgerProcessRoute::getProcessRouteId, processRoute.getId()));
+
+ // 灏嗘暟鎹縼绉诲埌sales_ledger_process_route
+ List<ProcessRouteItem> routeItems = processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
+ SalesLedgerProcessRoute ledgerProcessRoute;
+ List<SalesLedgerProcessRoute> salesLedgerProcessRouteList = new ArrayList<>();
+ for (ProcessRouteItem routeItem : routeItems) {
+ ledgerProcessRoute = new SalesLedgerProcessRoute();
+ ledgerProcessRoute.setProcessRouteId(processRoute.getId());
+ ledgerProcessRoute.setSalesLedgerId(salesLedger.getId());
+ ledgerProcessRoute.setProcessRouteItemId(routeItem.getId());
+ salesLedgerProcessRouteList.add(ledgerProcessRoute);
+ }
+ salesLedgerProcessRouteService.saveBatch(salesLedgerProcessRouteList);
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 1b5e2b4..911aa85 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -7,6 +7,7 @@
<result property="routeId" column="route_id"/>
<result property="processId" column="process_id"/>
<result property="productModelId" column="product_model_id"/>
+ <result property="processName" column="process_name"/>
<result property="tenantId" column="tenant_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
@@ -14,22 +15,9 @@
</resultMap>
<select id="listProcessRouteItemDto" resultType="com.ruoyi.production.dto.ProcessRouteItemDto">
- select pri.*,
- pr.description ,
- pp.name as process_name,
- pm.speculative_trading_name,
- pm.product_id,
- pm.model,
- p.product_name,
- pm.unit
- from
- process_route_item pri
- left join product_model pm on pri.product_model_id = pm.id
- left join product_process pp on pp.id = pri.process_id
- left join product p on p.id = pm.product_id
- left join process_route pr on pr.id = pri.route_id
- where
- pri.route_id = #{c.routeId}
+ select *
+ from process_route_item pri
+ where pri.route_id = #{c.routeId}
order by pri.drag_sort
</select>
</mapper>
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51c11b4..43f4434 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -4,25 +4,19 @@
<resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
- <id property="id" column="id"/>
- <result property="productModelId" column="product_model_id"/>
- <result property="description" column="description"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="description" column="description"/>
+ <result property="processRouteName" column="process_route_name"/>
+ <result property="isDefault" column="is_default"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
+ select *
from process_route ps
- left join product_bom pb on ps.bom_id = pb.id
- left join product_model pm on ps.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- <where>
- <if test="c.model != null and c.model != ''">
- and pm.model like concat('%',#{c.model},'%')
- </if>
- </where>
- order by ps.id asc
+ order by ps.id
</select>
</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerProcessRouteMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProcessRouteMapper.xml
new file mode 100644
index 0000000..d531704
--- /dev/null
+++ b/src/main/resources/mapper/sales/SalesLedgerProcessRouteMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerProcessRouteMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.sales.pojo.SalesLedgerProcessRoute">
+ <id column="id" property="id" />
+ <result column="sales_ledger_id" property="salesLedgerId" />
+ <result column="process_route_id" property="processRouteId" />
+ <result column="remark" property="remark" />
+ <result column="drag_sort" property="dragSort" />
+ <result column="process_route_item_id" property="processRouteItemId" />
+ <result column="create_time" property="createTime" />
+ <result column="tenant_id" property="tenantId" />
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.3