From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 18 +-
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationParamServiceImpl.java | 35 ++--
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 10 +
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 8
src/main/resources/mapper/technology/TechnologyRoutingMapper.xml | 3
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationServiceImpl.java | 34 ++++
src/main/resources/mapper/production/ProductionOrderMapper.xml | 13 -
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 3
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 2
src/main/java/com/ruoyi/technology/service/TechnologyRoutingOperationService.java | 2
src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java | 3
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java | 7 +
src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java | 21 --
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 1
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 6
src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java | 6
src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java | 2
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 6
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 148 ++++++++++----------
src/main/java/com/ruoyi/production/service/ProductionOrderService.java | 3
src/main/resources/mapper/production/ProductionPlanMapper.xml | 48 ++++++
src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java | 9 +
src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java | 4
24 files changed, 242 insertions(+), 152 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index a980ce2..60ab542 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -42,4 +42,14 @@
@Schema(description = "浜у搧ID")
private Long productId;
+ @Schema(description = "绛涢�夊紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate requiredDateStart;
+
+ @Schema(description = "绛涢�夌粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate requiredDateEnd;
+
}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
index 842fc9b..a39c83a 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
@@ -21,4 +21,13 @@
@Schema(description = "浜у搧ID")
private Long productId;
+
+ @Schema(description = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Schema(description = "椤圭洰鍚嶇О")
+ private String projectName;
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index b875fd4..60ce243 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
+import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.service.ProductionOrderService;
import io.swagger.v3.oas.annotations.Operation;
@@ -43,18 +44,11 @@
}
@PostMapping("/addOrder")
- @Operation(summary = "鏂板鐢熶骇璁㈠崟", description = "鏂板涓嬪崟鍙敮鎸佷袱绉嶆柟寮忥細1. 鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
- + "2. 鎵嬪姩鏂板锛屽繀椤讳紶 productModelId 鍜� quantity銆�"
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟", description = "鏂板涓嬪崟鍙敮鎸�1绉嶆柟寮忥細鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
+ "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)))
+ , content = @Content(schema = @Schema(implementation = ProductionOrder.class)))
public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
- return R.ok(productionOrderService.saveProductionOrder(productionOrder));
- }
-
- @PutMapping("/editOrder")
- @Operation(summary = "淇敼鐢熶骇璁㈠崟")
- public R<Boolean> edit(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
@@ -75,4 +69,10 @@
public R<Boolean> remove(@RequestBody List<Long> ids) {
return R.ok(productionOrderService.removeProductionOrder(ids));
}
+
+ @GetMapping("/source/{id}")
+ @Operation(summary = "鐢熶骇璁㈠崟鏌ヨ鏉ユ簮")
+ public R<List<ProductionPlanVo>> getSource(@PathVariable Long id) {
+ return R.ok(productionOrderService.getSource(id));
+ }
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
index 841dd10..15358f3 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
@@ -27,4 +27,6 @@
List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);
ProductionPlanDto selectProductionPlanDtoById(@Param("productionPlanId") Long productionPlanId);
+
+ List<ProductionPlanVo> getSource(@Param("ids") List<Long> planIds);
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
index edcd62f..5ae58d9 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOperationTask.java
@@ -73,4 +73,7 @@
@Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "鏉冮檺鐢ㄦ埛ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傛寚瀹氬涓敤鎴稩D鏃讹紝鐢ㄩ�楀彿鍒嗛殧銆�")
+ private String userIds;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index a99ea09..9e29fe8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -29,9 +29,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "閿�鍞彴璐d銆傜敓浜т笅鍗曟帴鍙ｉ�氬父涓嶉渶瑕佸墠绔墜宸ュ～鍐欙紝瀛樺湪閿�鍞潵婧愭椂鐢辩郴缁熷唴閮ㄥ洖濉��")
- private Long salesLedgerId;
-
@Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傚鏋滄寜鐢熶骇璁″垝鐢熸垚璁㈠崟锛屾柊澧炴椂浼犺繖涓瓧娈靛嵆鍙紝绯荤粺浼氳嚜鍔ㄦ眹鎬讳骇鍝佽鏍煎拰鏁伴噺銆�")
private String productionPlanIds;
@@ -63,9 +60,6 @@
@Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
-
- @Schema(description = "閿�鍞骇鍝佽鏍糹d銆傜敓浜т笅鍗曟帴鍙ｄ竴鑸笉浣滀负鍓嶇蹇呭～椤癸紝瀛樺湪閿�鍞潵婧愭椂鐢辩郴缁熷唴閮ㄥ叧鑱斻��")
- private Integer salesLedgerProductId;
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
index 7086222..3915d97 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderBom.java
@@ -3,11 +3,8 @@
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.math.BigDecimal;
/**
* <p>
@@ -28,26 +25,20 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "鐖惰妭鐐笽D")
- private Long parentId;
-
@Schema(description = "鐢熶骇璁㈠崟id")
private Long productionOrderId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
- @Schema(description = "宸ュ簭id")
- private Long technologyOperationId;
+ @Schema(description = "BOM缂栧彿")
+ private String bomNo;
- @Schema(description = "鍗曚綅浜у嚭闇�瑕佹暟閲�")
- private BigDecimal unitQuantity;
+ @Schema(description = "澶囨敞")
+ private String remark;
- @Schema(description = "闇�姹傛暟閲�")
- private BigDecimal demandedQuantity;
-
- @Schema(description = "鍗曚綅")
- private String unit;
+ @Schema(description = "鐗堟湰鍙�")
+ private String version;
@Schema(description = "bom鐨刬d")
private Long bomId;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index f488269..e0180e1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.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.math.BigDecimal;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
index 2a9ffae..df83127 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperation.java
@@ -31,8 +31,8 @@
@Schema(description = "宸ヨ壓璺嚎宸ュ簭琛╥d")
private Long technologyRoutingOperationId;
- @Schema(description = "宸ヨ壓璺嚎id")
- private Long technologyRoutingId;
+ @Schema(description = "鐢熶骇璁㈠崟宸ヨ壓璺嚎id")
+ private Long orderRoutingId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index b49e712..86b5f4d 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -74,14 +74,8 @@
@Schema(description = "宸蹭笅鍙戞暟閲�")
private BigDecimal quantityIssued;
- @Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
- private Boolean issued;
-
@Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
-
- @Schema(description = "瀹℃牳鐘舵��")
- private String isAudit;
@Schema(description = "鎵胯鏃ユ湡")
private LocalDate promisedDeliveryDate;
diff --git a/src/main/java/com/ruoyi/production/service/ProductionOrderService.java b/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
index 0bd9709..95d3fc4 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionOrderService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
+import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.pojo.ProductionOrder;
import java.util.List;
@@ -24,4 +25,6 @@
int syncProductionOrderSnapshot(Long productionOrderId);
Object bindingRoute(ProductionOrderDto productionOrderDto);
+
+ List<ProductionPlanVo> getSource(Long id);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
index 3895608..489fc30 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
@@ -91,7 +91,7 @@
Long routingId = null;
ProductionOrderRoutingOperation deleteItem = productionOrderRoutingOperationMapper.selectById(id);
if (deleteItem != null) {
- routingId = deleteItem.getTechnologyRoutingId();
+ routingId = deleteItem.getOrderRoutingId();
}
productionOperationTaskMapper.delete(new LambdaQueryWrapper<ProductionOperationTask>()
.eq(ProductionOperationTask::getTechnologyRoutingOperationId, id));
@@ -99,7 +99,7 @@
if (routingId != null) {
List<ProductionOrderRoutingOperation> operationList = productionOrderRoutingOperationMapper.selectList(
Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
- .eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, routingId)
+ .eq(ProductionOrderRoutingOperation::getOrderRoutingId, routingId)
.eq(ProductionOrderRoutingOperation::getProductionOrderId, productionOrderId)
.orderByAsc(ProductionOrderRoutingOperation::getDragSort));
for (int i = 0; i < operationList.size(); i++) {
@@ -121,7 +121,7 @@
ProductionOrderRoutingOperation oldItem = productionOrderRoutingOperationMapper.selectById(productionOrderRoutingOperation.getId());
List<ProductionOrderRoutingOperation> operationList = productionOrderRoutingOperationMapper.selectList(
Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
- .eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, oldItem.getTechnologyRoutingId())
+ .eq(ProductionOrderRoutingOperation::getOrderRoutingId, oldItem.getOrderRoutingId())
.orderByAsc(ProductionOrderRoutingOperation::getDragSort));
Integer targetPosition = productionOrderRoutingOperation.getDragSort();
if (targetPosition != null && targetPosition >= 1) {
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 b05665f..9be6ae2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -16,14 +16,13 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
+import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionOrderService;
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 com.ruoyi.technology.mapper.*;
import com.ruoyi.technology.pojo.*;
import lombok.RequiredArgsConstructor;
@@ -105,7 +104,6 @@
if (!saved) {
return false;
}
- syncProductionPlanIssueStatus(oldOrder, productionOrder);
boolean needSync = productionOrder.getTechnologyRoutingId() != null
&& (oldOrder == null
|| !Objects.equals(oldOrder.getTechnologyRoutingId(), productionOrder.getTechnologyRoutingId())
@@ -180,6 +178,16 @@
}
@Override
+ public List<ProductionPlanVo> getSource(Long id) {
+ ProductionOrder productionOrder = baseMapper.selectById(id);
+ if (productionOrder != null && productionOrder.getProductionPlanIds() != null) {
+ List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
+ return productionPlanMapper.getSource(planIds);
+ }
+ return null;
+ }
+
+ @Override
public int syncProductionOrderSnapshot(Long productionOrderId) {
ProductionOrder productionOrder = this.getById(productionOrderId);
if (productionOrder == null) {
@@ -224,7 +232,7 @@
ProductionOrderRoutingOperation targetOperation = new ProductionOrderRoutingOperation();
targetOperation.setProductionOrderId(productionOrder.getId());
targetOperation.setTechnologyRoutingOperationId(sourceOperation.getId());
- targetOperation.setTechnologyRoutingId(orderRouting.getId());
+ targetOperation.setOrderRoutingId(orderRouting.getId());
targetOperation.setProductModelId(sourceOperation.getProductModelId());
targetOperation.setDragSort(sourceOperation.getDragSort());
targetOperation.setIsQuality(sourceOperation.getIsQuality());
@@ -289,10 +297,9 @@
orderBom.setProductionOrderId(productionOrder.getId());
orderBom.setBomId(Long.valueOf(technologyBom.getId()));
orderBom.setProductModelId(root != null ? root.getProductModelId() : productionOrder.getProductModelId());
- orderBom.setTechnologyOperationId(root == null ? null : root.getOperationId());
- orderBom.setUnitQuantity(root != null && root.getUnitQuantity() != null ? root.getUnitQuantity() : BigDecimal.ONE);
- orderBom.setDemandedQuantity(orderQuantity);
- orderBom.setUnit(root == null ? null : root.getUnit());
+ orderBom.setRemark(technologyBom.getRemark());
+ orderBom.setBomNo(technologyBom.getBomNo());
+ orderBom.setVersion(technologyBom.getVersion());
productionOrderBomMapper.insert(orderBom);
Map<Long, Long> idMap = new HashMap<>();
@@ -354,7 +361,6 @@
ProductionOrder query = dto == null ? new ProductionOrder() : dto;
return Wrappers.<ProductionOrder>lambdaQuery()
.eq(query.getId() != null, ProductionOrder::getId, query.getId())
- .eq(query.getSalesLedgerId() != null, ProductionOrder::getSalesLedgerId, query.getSalesLedgerId())
.eq(query.getProductModelId() != null, ProductionOrder::getProductModelId, query.getProductModelId())
.eq(query.getTechnologyRoutingId() != null, ProductionOrder::getTechnologyRoutingId, query.getTechnologyRoutingId())
.like(query.getNpsNo() != null && !query.getNpsNo().trim().isEmpty(), ProductionOrder::getNpsNo, query.getNpsNo())
@@ -406,7 +412,6 @@
if (productionOrder == null) {
throw new ServiceException("鐢熶骇璁㈠崟涓嶈兘涓虹┖");
}
- fillFromSalesLedgerProduct(productionOrder);
fillFromProductionPlans(productionOrder);
if (productionOrder.getProductModelId() == null) {
throw new ServiceException("浜у搧瑙勬牸ID涓嶈兘涓虹┖");
@@ -414,54 +419,23 @@
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("涓嬪崟鏁伴噺蹇呴』澶т簬0");
}
-// if (productionOrder.getTechnologyRoutingId() == null) {
-// // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
-// TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
-// Wrappers.<TechnologyRouting>lambdaQuery()
-// .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
-// .orderByDesc(TechnologyRouting::getId)
-// .last("limit 1"));
-// if (technologyRouting == null) {
-// throw new ServiceException("鏈壘鍒拌浜у搧瑙勬牸瀵瑰簲鐨勫伐鑹鸿矾绾�");
-// }
-// productionOrder.setTechnologyRoutingId(technologyRouting.getId());
-// }
+ if (productionOrder.getTechnologyRoutingId() == null) {
+ // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
+ TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
+ Wrappers.<TechnologyRouting>lambdaQuery()
+ .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
+ .orderByDesc(TechnologyRouting::getId)
+ .last("limit 1"));
+ if (technologyRouting != null) {
+ productionOrder.setTechnologyRoutingId(technologyRouting.getId());
+ }
+ }
if (oldOrder != null && ProductOrderStatusEnum.isStarted(oldOrder.getStatus())) {
// 寮�宸ュ悗鍙厑璁镐慨姝ｉ潪鏍稿績瀛楁锛屾牳蹇冪敓浜т緷鎹攣瀹氥��
if (!Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
|| !Objects.equals(oldOrder.getTechnologyRoutingId(), productionOrder.getTechnologyRoutingId())
|| compareDecimal(oldOrder.getQuantity(), productionOrder.getQuantity()) != 0) {
throw new ServiceException("鐢熶骇璁㈠崟宸插紑宸ワ紝涓嶈兘淇敼浜у搧銆佸伐鑹鸿矾绾挎垨鏁伴噺");
- }
- }
- }
-
- private void fillFromSalesLedgerProduct(ProductionOrder productionOrder) {
- if (productionOrder.getSalesLedgerProductId() == null) {
- return;
- }
- // 閿�鍞槑缁嗘槸璁㈠崟鏉ユ簮鏃讹紝浠ラ攢鍞槑缁嗕负鍑嗗洖濉攢鍞彴璐︺�佷骇鍝佽鏍煎拰榛樿鏁伴噺銆�
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productionOrder.getSalesLedgerProductId().longValue());
- if (salesLedgerProduct == null) {
- throw new ServiceException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪");
- }
- if (productionOrder.getSalesLedgerId() == null) {
- productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
- } else if (!Objects.equals(productionOrder.getSalesLedgerId(), salesLedgerProduct.getSalesLedgerId())) {
- throw new ServiceException("閿�鍞彴璐D涓庨攢鍞彴璐︿骇鍝佷笉涓�鑷�");
- }
- if (productionOrder.getProductModelId() == null) {
- productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
- } else if (!Objects.equals(productionOrder.getProductModelId(), salesLedgerProduct.getProductModelId())) {
- throw new ServiceException("浜у搧瑙勬牸ID涓庨攢鍞彴璐︿骇鍝佷笉涓�鑷�");
- }
- if (productionOrder.getQuantity() == null || productionOrder.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
- productionOrder.setQuantity(salesLedgerProduct.getQuantity());
- }
- if (productionOrder.getPlanCompleteTime() == null && productionOrder.getSalesLedgerId() != null) {
- SalesLedger salesLedger = salesLedgerMapper.selectById(productionOrder.getSalesLedgerId());
- if (salesLedger != null && salesLedger.getDeliveryDate() != null) {
- productionOrder.setPlanCompleteTime(salesLedger.getDeliveryDate());
}
}
}
@@ -507,43 +481,73 @@
productionOrder.setProductionPlanIds(formatPlanIds(planIds));
}
- private void syncProductionPlanIssueStatus(ProductionOrder oldOrder, ProductionOrder newOrder) {
- // 鍙鐞嗘湰娆″閲忓彉鍖栵紝閬垮厤鏃犲叧璁″垝琚噸澶嶅啓鐘舵�併��
- Set<Long> oldIds = new LinkedHashSet<>(parsePlanIds(oldOrder == null ? null : oldOrder.getProductionPlanIds()));
- Set<Long> newIds = new LinkedHashSet<>(parsePlanIds(newOrder == null ? null : newOrder.getProductionPlanIds()));
- Set<Long> toRelease = new LinkedHashSet<>(oldIds);
- toRelease.removeAll(newIds);
- Set<Long> toIssue = new LinkedHashSet<>(newIds);
- toIssue.removeAll(oldIds);
- if (!toRelease.isEmpty()) {
- updatePlanIssuedFlag(new ArrayList<>(toRelease), false);
- }
- if (!toIssue.isEmpty()) {
- updatePlanIssuedFlag(new ArrayList<>(toIssue), true);
- }
- }
-
private void releaseProductionPlanIssueStatus(ProductionOrder productionOrder) {
if (productionOrder == null) {
return;
}
List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
if (!planIds.isEmpty()) {
- updatePlanIssuedFlag(planIds, false);
+ // 鐢熶骇璁㈠崟鍒犻櫎--瀵瑰簲鐨勭敓浜ц鍒掔殑宸蹭笅鍙戞暟閲忚鍑忓幓
+ updatePlanIssuedFlag(planIds, productionOrder.getQuantity());
}
}
- private void updatePlanIssuedFlag(List<Long> planIds, boolean issued) {
+ //鐢熶骇璁㈠崟鍒犻櫎锛岀敓浜ц鍒掔殑宸蹭笅鍙戞暟閲忓搴斿彉鏇�
+ private void updatePlanIssuedFlag(List<Long> planIds, BigDecimal remainingAssignedQuantity) {
if (planIds == null || planIds.isEmpty()) {
return;
}
List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(planIds);
+ //涓嬪彂鏁伴噺鍑忓幓
+ List<ProductionPlan> updates = new ArrayList<>();
for (ProductionPlan plan : plans) {
+ 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 = remainingAssignedQuantity.min(historicalIssuedQuantity);
+ remainingAssignedQuantity = remainingAssignedQuantity.subtract(issuedQuantity);
+ BigDecimal totalIssuedQuantity = historicalIssuedQuantity.subtract(issuedQuantity);
+ int planStatus = resolvePlanStatus(requiredQuantity, totalIssuedQuantity);
ProductionPlan update = new ProductionPlan();
update.setId(plan.getId());
- update.setIssued(issued);
- productionPlanMapper.updateById(update);
+ update.setStatus(planStatus);
+ update.setQuantityIssued(totalIssuedQuantity);
+ updates.add(update);
}
+ if (!updates.isEmpty()) {
+ productionPlanMapper.updateById(updates);
+ }
+ }
+
+ 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 0;
+ }
+ if (issuedQuantity == null || issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return 0;
+ }
+ return issuedQuantity.compareTo(requiredQuantity) < 0 ? 1 : 2;
}
private void upsertOrderPick(ProductionOrder productionOrder) {
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 5fba66d..b3ad742 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -160,7 +160,6 @@
update.setId(plan.getId());
update.setStatus(planStatus);
update.setQuantityIssued(totalIssuedQuantity);
- update.setIssued(planStatus == PLAN_STATUS_ISSUED);
updates.add(update);
}
if (!updates.isEmpty()) {
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 24c06d7..c148955 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -169,7 +169,7 @@
List<ProductionOrderRoutingOperation> routingOperationList = productionOrderRoutingOperationMapper.selectList(
Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
- .eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, routingOperation.getTechnologyRoutingId())
+ .eq(ProductionOrderRoutingOperation::getOrderRoutingId, routingOperation.getOrderRoutingId())
.eq(ProductionOrderRoutingOperation::getProductionOrderId, routingOperation.getProductionOrderId()));
boolean isLastOperation = routingOperation.getDragSort() != null && routingOperation.getDragSort().equals(routingOperationList.size());
if (productQty.compareTo(BigDecimal.ZERO) > 0) {
@@ -245,8 +245,8 @@
}
ProductionAccount productionAccount = new ProductionAccount();
productionAccount.setProductionProductMainId(productionProductMain.getId());
- productionAccount.setSalesLedgerId(productionOrder.getSalesLedgerId());
- productionAccount.setSalesLedgerProductId(productionOrder.getSalesLedgerProductId() == null ? null : productionOrder.getSalesLedgerProductId().longValue());
+// productionAccount.setSalesLedgerId(productionOrder.getSalesLedgerId());
+// 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);
@@ -301,7 +301,7 @@
// 鍙湁鏈�鍚庝竴閬撳伐搴忕殑鎶ュ伐鎵嶄細褰卞搷鐢熶骇璁㈠崟瀹屽伐鏁伴噺銆�
List<ProductionOrderRoutingOperation> routingOperationList = productionOrderRoutingOperationMapper.selectList(
Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
- .eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, routingOperation.getTechnologyRoutingId())
+ .eq(ProductionOrderRoutingOperation::getOrderRoutingId, routingOperation.getOrderRoutingId())
.eq(ProductionOrderRoutingOperation::getProductionOrderId, routingOperation.getProductionOrderId()));
boolean isLastOperation = routingOperation.getDragSort() != null && routingOperation.getDragSort().equals(routingOperationList.size());
if (isLastOperation) {
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index 876d68e..5a9865d 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -163,7 +163,7 @@
BeanUtils.copyProperties(sourceOperation, newOperation);
newOperation.setId(null);
newOperation.setProductionOrderId(newOrder.getId());
- newOperation.setTechnologyRoutingId(routingIdMap.get(sourceOperation.getTechnologyRoutingId()));
+ newOperation.setOrderRoutingId(routingIdMap.get(sourceOperation.getOrderRoutingId()));
newOperation.setCreateTime(null);
newOperation.setUpdateTime(null);
productionOrderRoutingOperationMapper.insert(newOperation);
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 98f03b4..be2c03f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -253,6 +253,7 @@
if (!salesLedgerProduct.getIsProduction()) {
return;
}
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerProduct.getSalesLedgerId());
ProductionPlan productionPlan = new ProductionPlan();
productionPlan.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
productionPlan.setSalesLedgerProductId(salesLedgerProduct.getId());
@@ -261,6 +262,8 @@
productionPlan.setQtyRequired(salesLedgerProduct.getQuantity());
productionPlan.setSource("閿�鍞�");
productionPlan.setStatus(0);
+ productionPlan.setRequiredDate(salesLedger.getDeliveryDate());//闇�姹傛棩鏈�=浜よ揣鏃ユ湡
+ productionPlan.setPromisedDeliveryDate(salesLedger.getDeliveryDate());//鎵胯鏃ユ湡=浜よ揣鏃ユ湡
productionPlanMapper.insert(productionPlan);
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
index 37868f8..eea52a0 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
@@ -7,6 +7,7 @@
import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingOperationService;
+import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
@@ -57,4 +58,10 @@
public R remove(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationService.removeTechnologyRoutingOperation(id));
}
+
+ @PostMapping ("/sort")
+ @Operation(summary = "鎺掑簭宸ヨ壓璺嚎宸ュ簭")
+ public R sort(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
+ return R.ok(technologyRoutingOperationService.sort(technologyRoutingOperation));
+ }
}
diff --git a/src/main/java/com/ruoyi/technology/service/TechnologyRoutingOperationService.java b/src/main/java/com/ruoyi/technology/service/TechnologyRoutingOperationService.java
index 25b468f..40c8710 100644
--- a/src/main/java/com/ruoyi/technology/service/TechnologyRoutingOperationService.java
+++ b/src/main/java/com/ruoyi/technology/service/TechnologyRoutingOperationService.java
@@ -21,4 +21,6 @@
boolean saveTechnologyRoutingOperation(TechnologyRoutingOperation technologyRoutingOperation);
boolean removeTechnologyRoutingOperation(Long id);
+
+ int sort(TechnologyRoutingOperation technologyRoutingOperation);
}
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationParamServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationParamServiceImpl.java
index 2db55b4..9f270fa 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationParamServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -90,23 +91,25 @@
);
}
int successCount = 0;
- for (TechnologyOperationParam operationParam : operationParamList) {
- boolean exists = technologyRoutingOperationParamMapper.selectCount(
- Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
- .eq(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, routingOperation.getId())
- .eq(TechnologyRoutingOperationParam::getTechnologyOperationParamId, operationParam.getId())
- ) > 0;
- if (!replaceExisting && exists) {
- continue;
+ if (CollectionUtils.isNotEmpty(operationParamList)) {
+ for (TechnologyOperationParam operationParam : operationParamList) {
+ boolean exists = technologyRoutingOperationParamMapper.selectCount(
+ Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
+ .eq(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, routingOperation.getId())
+ .eq(TechnologyRoutingOperationParam::getTechnologyOperationParamId, operationParam.getId())
+ ) > 0;
+ if (!replaceExisting && exists) {
+ continue;
+ }
+ TechnologyRoutingOperationParam snapshot = new TechnologyRoutingOperationParam();
+ snapshot.setTechnologyRoutingOperationId(routingOperation.getId());
+ snapshot.setTechnologyOperationParamId(operationParam.getId());
+ snapshot.setTechnologyOperationId(operationParam.getTechnologyOperationId());
+ snapshot.setStandardValue(operationParam.getStandardValue());
+ fillFromOperationParam(snapshot, routingOperation);
+ technologyRoutingOperationParamMapper.insert(snapshot);
+ successCount++;
}
- TechnologyRoutingOperationParam snapshot = new TechnologyRoutingOperationParam();
- snapshot.setTechnologyRoutingOperationId(routingOperation.getId());
- snapshot.setTechnologyOperationParamId(operationParam.getId());
- snapshot.setTechnologyOperationId(operationParam.getTechnologyOperationId());
- snapshot.setStandardValue(operationParam.getStandardValue());
- fillFromOperationParam(snapshot, routingOperation);
- technologyRoutingOperationParamMapper.insert(snapshot);
- successCount++;
}
return successCount;
}
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationServiceImpl.java
index 1daf6dc..bff3a44 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationServiceImpl.java
@@ -76,6 +76,40 @@
return removed;
}
+ @Override
+ public int sort(TechnologyRoutingOperation technologyRoutingOperation) {
+ //鏌ヨ琚敼鍔ㄧ殑杩欐潯鏁版嵁
+ TechnologyRoutingOperation oldtechnologyRoutingOperation = technologyRoutingOperationMapper.selectById(technologyRoutingOperation.getId());
+ //鏌ヨ璇ュ伐鑹鸿矾绾跨殑鎵�鏈夊伐搴忓苟鎸夌収椤哄簭鎺掑簭
+ List<TechnologyRoutingOperation> technologyRouteOperations = technologyRoutingOperationMapper.selectList(Wrappers.<TechnologyRoutingOperation>lambdaQuery()
+ .eq(TechnologyRoutingOperation::getTechnologyRoutingId, oldtechnologyRoutingOperation.getTechnologyRoutingId())
+ .orderByAsc(TechnologyRoutingOperation::getDragSort));
+ // 鑾峰彇鐩爣浣嶇疆锛堢Щ鍔ㄥ埌绗嚑涓箣鍚庯級
+ Integer targetPosition = technologyRoutingOperation.getDragSort();
+ if (targetPosition != null && targetPosition >= 0) {
+ // 绉诲姩鍏冪礌鍒版柊鐨勪綅缃�
+ technologyRouteOperations.remove(oldtechnologyRoutingOperation);
+ technologyRouteOperations.add(targetPosition-1, oldtechnologyRoutingOperation);
+ // 鏇存柊鎵�鏈夊彈褰卞搷鐨勬帓搴忓瓧娈�
+ for (int i = 0; i < technologyRouteOperations.size(); i++) {
+ TechnologyRoutingOperation item = technologyRouteOperations.get(i);
+ if (!item.getId().equals(oldtechnologyRoutingOperation.getId())) {
+ // 妫�鏌ユ槸鍚﹂渶瑕佹洿鏂版帓搴忓��
+ if (item.getDragSort() != i+1) {
+ item.setDragSort(i+1);
+ technologyRoutingOperationMapper.updateById(item);
+ }
+ } else {
+ // 鏇存柊鍘熻褰曠殑鏂版帓搴忎綅缃�
+ oldtechnologyRoutingOperation.setDragSort(targetPosition);
+ technologyRoutingOperationMapper.updateById(oldtechnologyRoutingOperation);
+ }
+ }
+ return 1;
+ }
+ return 0;
+ }
+
private Integer nextDragSort(Long technologyRoutingId) {
TechnologyRoutingOperation lastOperation = technologyRoutingOperationMapper.selectOne(
Wrappers.<TechnologyRoutingOperation>lambdaQuery()
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 40af51d..8166dad 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -5,7 +5,6 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionOrder">
<id column="id" property="id" />
- <result column="sales_ledger_id" property="salesLedgerId" />
<result column="production_plan_ids" property="productionPlanIds" />
<result column="product_model_id" property="productModelId" />
<result column="nps_no" property="npsNo" />
@@ -16,7 +15,6 @@
<result column="complete_quantity" property="completeQuantity" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
- <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" />
@@ -33,7 +31,6 @@
<sql id="ProductionOrderVoColumns">
po.id,
- po.sales_ledger_id,
po.production_plan_ids,
po.product_model_id,
po.nps_no,
@@ -44,13 +41,10 @@
po.complete_quantity,
po.start_time,
po.end_time,
- po.sales_ledger_product_id,
po.create_user,
po.dept_id,
po.plan_complete_time,
po.status,
- sl.sales_contract_no as salesContractNo,
- sl.customer_name as customerName,
p.product_name as productName,
pm.model as model,
tr.process_route_code as processRouteCode,
@@ -59,7 +53,6 @@
<sql id="ProductionOrderVoFrom">
from production_order po
- left join sales_ledger sl on po.sales_ledger_id = sl.id
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
@@ -72,17 +65,11 @@
<if test="c.id != null">
and po.id = #{c.id}
</if>
- <if test="c.salesLedgerId != null">
- and po.sales_ledger_id = #{c.salesLedgerId}
- </if>
<if test="c.productModelId != null">
and po.product_model_id = #{c.productModelId}
</if>
<if test="c.technologyRoutingId != null">
and po.technology_routing_id = #{c.technologyRoutingId}
- </if>
- <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/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index da0d293..a389d32 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -16,7 +16,6 @@
<result column="qty_required" property="qtyRequired"/>
<result column="issued" property="issued"/>
<result column="source" property="source"/>
- <result column="is_audit" property="isAudit"/>
<result column="promised_delivery_date" property="promisedDeliveryDate"/>
</resultMap>
@@ -26,10 +25,36 @@
pm.model,
p.id as productId,
p.product_name AS productName,
- pm.unit
+ pm.unit,
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.project_name
FROM production_plan pp
left join product_model pm on pp.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join sales_ledger sl on pp.sales_ledger_id = sl.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and pp.id = #{c.id}
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
+ <if test="c.status != null">
+ and pp.status = #{c.status}
+ </if>
+ <if test="c.mpsNo != null and c.mpsNo != ''">
+ and pp.mps_no like concat('%', #{c.mpsNo}, '%')
+ </if>
+ <if test="c.requiredDateStart != null and c.requiredDateEnd != null">
+ and pp.required_date between #{c.requiredDateStart} and #{c.requiredDateEnd}
+ </if>
+ </if>
+ </where>
ORDER BY COALESCE(pp.id) DESC
</select>
@@ -59,4 +84,23 @@
left join product p on pm.product_id = p.id
WHERE pp.id = #{productionPlanId}
</select>
+ <select id="getSource" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
+ SELECT
+ pp.*,
+ pm.model,
+ p.product_name AS productName,
+ pm.unit,
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.project_name
+ FROM production_plan pp
+ LEFT JOIN product_model pm ON pp.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ left join sales_ledger sl on pp.sales_ledger_id = sl.id
+ WHERE pp.id IN
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ ORDER BY pp.id ASC
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
index 6287d37..bda31ba 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
@@ -39,6 +39,9 @@
<if test="c.productModelId != null">
and tr.product_model_id = #{c.productModelId}
</if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
<if test="c.bomId != null">
and tr.bom_id = #{c.bomId}
</if>
--
Gitblit v1.9.3