From 3166624edda4fc938593432b619fa5ad00409f0a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 03 十一月 2026 16:49:12 +0800
Subject: [PATCH] feat(outsource): 1.支持外协订单按物料属性分流复用原有业务流程 2.修复工时字段空值判断与赋值逻辑
---
inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
index a884031..5a8ed83 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
@@ -34,6 +34,9 @@
*/
IPage<IfsInventoryQuantity> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
+ /** 鏌ヨ鎸囧畾澶栧崗鍒嗙被鐨勫緟涓嬪崟鏁版嵁銆� */
+ IPage<IfsInventoryQuantity> getOutsourceWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
+
/**
* 鏌ヨ妫�楠屽��
* @param page
@@ -42,7 +45,16 @@
*/
IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
- int inspectionReport(List<Long> ids);
+ /** 鏌ヨ鎸囧畾澶栧崗鍒嗙被鐨勬楠屼腑鏁版嵁銆� */
+ IPage<IfsInventoryQuantityDto> getOutsourceByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto dto);
+
+ /** 鏌ヨ鎸囧畾澶栧崗鍒嗙被鐨勫凡妫�楠屾暟鎹�� */
+ IPage<IfsInventoryQuantitySupplierDto> getOutsourceByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto dto);
+
+ /** 鏌ヨ鎸囧畾澶栧崗鍒嗙被鐨勫叏閮ㄦ姤妫�鏁版嵁銆� */
+ IPage<IfsInventoryQuantitySupplierDto> getOutsourceByAll(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto dto);
+
+ int inspectionReport(List<Long> ids,String orderType,String materialProp);
int revokeInspectionReport(Long id);
@@ -155,4 +167,6 @@
Result importSplitOrderData(MultipartFile file,Long ifsId, HttpServletRequest request);
boolean confirmSplitOrder(OrderSplitDTO orderSplitDTO);
+
+ Long getOrderCountByIfsId(Long ifsId);
}
--
Gitblit v1.9.3