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/OutsourceOrderFlowService.java        |   39 +++++++++
 inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java      |    7 +
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java         |   28 ++++++
 inspect-server/src/main/java/com/ruoyi/inspect/vo/IfsOrderVO.java                            |    4 +
 basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java                  |    4 +
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java |   70 ++++++++++++++++
 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java          |   12 +++
 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java  |    6 +
 inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java    |   33 ++++++++
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java     |    5 +
 ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderType.java                             |    4 
 11 files changed, 203 insertions(+), 9 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
index 83db775..e2f0fc8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
@@ -82,4 +82,8 @@
 
     @ApiModelProperty("閿�鍞鍗曞垎绫�")
     private String orderType;
+
+    /** 鎺ユ敹鐗╂枡灞炴�х瓫閫夛紝骞惰繑鍥炴楠屼腑璁㈠崟鐨勭湡瀹炲睘鎬с�� */
+    @ApiModelProperty("鐗╂枡灞炴��")
+    private String materialProp;
 }
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index cd3fddb..0ad1d00 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -386,7 +386,7 @@
                     if (sp.getPrice() != null && !sp.getPrice().equals("")) {
                         pl.setPrice(sp.getPrice());
                     }
-                    if (sp.getManHour() != null && !sp.getManHour().equals("")) {
+                    if (StringUtils.isNotBlank(sp.getManHour())) {
                         pl.setManHour(sp.getManHour());
                     }
                     if (sp.getSection() != null && !sp.getSection().equals("")) {
@@ -648,7 +648,9 @@
                     cur.setAsk(old.getAsk());
                     cur.setTell(old.getTell());
                     cur.setPrice(old.getPrice());
-                    cur.setManHour(old.getManHour());
+                    if (StringUtils.isNotBlank(old.getManHour())) {
+                        cur.setManHour(old.getManHour());
+                    }
                     cur.setSection(old.getSection());
                     cur.setCores(old.getCores());
                     cur.setConductorMaterial(old.getConductorMaterial());
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java
index e6bb1db..40eec31 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java
@@ -15,6 +15,7 @@
 import com.ruoyi.inspect.dto.IfsPartPropsRecordDTO;
 import com.ruoyi.inspect.service.IfsPartPropsRecordService;
 import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
+import com.ruoyi.inspect.service.OutsourceOrderFlowService;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -43,6 +44,9 @@
     @Autowired
     private IfsPartPropsRecordService ifsPartPropsRecordService;
 
+    @Autowired
+    private OutsourceOrderFlowService outsourceOrderFlowService;
+
     @Before(value = "execution(* com.ruoyi.inspect.service.impl.RawMaterialOrderServiceImpl.rawOrderRelease(..))")
     @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     public void doAfterReturning(JoinPoint joinPoint) {
@@ -59,7 +63,8 @@
                 JSONObject entries = JSONUtil.parseObj(queryPartLotResult.getData());
                 JSONArray listInfo = entries.getJSONArray("LIST_INFO");
                 //濡傛灉璁㈠崟鏄疜JNS鍩熺殑澶栬喘璁㈠崟锛屽厤妫�鏃跺悓姝TNS鍩熺殑IFS鎵规灞炴��
-                if(StringUtils.equals(ContractType.KJNS.getValue(),ifsInventoryQuantity.getContract()) && StringUtils.equals(OrderType.WG.getValue(),ifsInventoryQuantity.getOrderType())){
+                if(StringUtils.equals(ContractType.KJNS.getValue(),ifsInventoryQuantity.getContract()) && StringUtils.equals(OrderType.WG.getValue(),
+                        outsourceOrderFlowService.resolve(ifsInventoryQuantity.getOrderType(), ifsInventoryQuantity.getMaterialProp()))){
                     //鏌ヨZTNS鍩熺殑鐩稿悓鎵规璁㈠崟娑堟伅
                     IfsInventoryQuantityDto ifsInventoryQuantityDto = new IfsInventoryQuantityDto();
                     BeanUtil.copyProperties(ifsInventoryQuantity,ifsInventoryQuantityDto);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index 9fd882a..8a7c4ce 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -17,6 +17,7 @@
 import com.ruoyi.inspect.service.InsOrderService;
 import com.ruoyi.inspect.service.RawMaterialOrderService;
 import com.ruoyi.inspect.service.RawMaterialOrderTemplateService;
+import com.ruoyi.inspect.service.OutsourceOrderFlowService;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.common.utils.WxCpUtils;
@@ -48,6 +49,7 @@
     private InsOrderService insOrderService;
     private RawMaterialOrderService rawMaterialOrderService;
     private RawMaterialOrderTemplateService rawMaterialOrderTemplateService;
+    private OutsourceOrderFlowService outsourceOrderFlowService;
 
     @ApiOperation(value = "鏇村叿闆朵欢鍙疯幏鍙栨爣鍑嗘爲")
     @GetMapping("/selectStandardTreeListByPartNo")
@@ -114,6 +116,7 @@
         if(!OrderType.validateValue(orderType)){
             throw new ErrorException("鎵归噺鎶ユ澶辫触,闈炴硶鐨勯攢鍞鍗曞垎绫绘灇涓�");
         }
+        outsourceOrderFlowService.resolve(orderType, materialProp);
         return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType,materialProp));
     }
 
@@ -189,6 +192,36 @@
         return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
     }
 
+    /** 澶栧崗璁㈠崟鎸夌湡瀹為攢鍞垎绫绘煡璇㈠緟涓嬪崟鏁版嵁銆� */
+    @GetMapping("/getOutsourceWarehouseSubmit")
+    @PreAuthorize("@ss.hasPermi('business:order')")
+    public Result getOutsourceWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) {
+        return Result.success(rawMaterialOrderService.getOutsourceWarehouseSubmit(page, ifsInventoryQuantity));
+    }
+
+    /** 鏌ヨ澶栧崗璁㈠崟妫�楠屼腑鍒楄〃銆� */
+    @GetMapping("/getOutsourceByStateOne")
+    @PreAuthorize("@ss.hasPermi('business:order')")
+    @PersonalScope(permsName = "business:order", objectName = IfsInventoryQuantityDto.class, paramName = "createUser")
+    public Result getOutsourceByStateOne(Page page, IfsInventoryQuantityDto dto) {
+        return Result.success(rawMaterialOrderService.getOutsourceByStateOne(page, dto));
+    }
+
+    /** 鏌ヨ澶栧崗璁㈠崟宸叉楠屽垪琛ㄣ�� */
+    @GetMapping("/getOutsourceByOver")
+    @PreAuthorize("@ss.hasPermi('business:order')")
+    @PersonalScope(permsName = "business:order", objectName = IfsInventoryQuantitySupplierDto.class, paramName = "createUser")
+    public Result getOutsourceByOver(Page page, IfsInventoryQuantitySupplierDto dto) {
+        return Result.success(rawMaterialOrderService.getOutsourceByOver(page, dto));
+    }
+
+    /** 鏌ヨ澶栧崗璁㈠崟鍏ㄩ儴鎶ユ鏁版嵁銆� */
+    @GetMapping("/getOutsourceByAll")
+    @PreAuthorize("@ss.hasPermi('get:Ifs:ByAll')")
+    public Result getOutsourceByAll(Page page, IfsInventoryQuantitySupplierDto dto) {
+        return Result.success(rawMaterialOrderService.getOutsourceByAll(page, dto));
+    }
+
     /**
      * 鍙栨秷鎶ユ
      * @param id
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/OutsourceOrderFlowService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/OutsourceOrderFlowService.java
new file mode 100644
index 0000000..bb354ae
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/OutsourceOrderFlowService.java
@@ -0,0 +1,39 @@
+package com.ruoyi.inspect.service;
+
+import com.ruoyi.common.enums.OrderType;
+import com.ruoyi.framework.exception.ErrorException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * 澶栧崗璁㈠崟澶嶇敤鐨勫師鏈変笟鍔℃祦绋嬨��
+ */
+@Service
+public class OutsourceOrderFlowService {
+
+    /** 鎸夊凡绾﹀畾鐨勭墿鏂欏睘鎬у瓧鍏搁敭鍊煎垎娴侊紝鍚屾椂鏍¢獙濮斿鍔犲伐灞炴�с�� */
+    public String resolve(String orderType, String materialProp) {
+        if (StringUtils.equals(orderType, OrderType.OUTSOURCE_INCOMING.getValue())) {
+            return OrderType.RAW.getValue();
+        }
+        if (StringUtils.equals(orderType, OrderType.OUTSOURCE_SUBCONTRACT.getValue())) {
+            if (StringUtils.equals(materialProp, "鍗婃垚鍝�")) {
+                return OrderType.RAW.getValue();
+            }
+            if (StringUtils.equals(materialProp, "鎴愬搧")) {
+                return OrderType.WG.getValue();
+            }
+            throw new ErrorException("濮斿鍔犲伐鐨勭墿鏂欏睘鎬у彧鑳戒负鍗婃垚鍝佹垨鎴愬搧");
+        }
+        return orderType;
+    }
+
+    /** 澶栧崗璁㈠崟鎸夊疄闄呮祦绋嬬‘瀹氫笅鍗曟潵婧愶紝鍏朵粬璁㈠崟淇濈暀鍘熸潵婧愩�� */
+    public Integer resolveTypeSource(String orderType, String materialProp, Integer typeSource) {
+        if (StringUtils.equals(orderType, OrderType.OUTSOURCE_INCOMING.getValue())
+                || StringUtils.equals(orderType, OrderType.OUTSOURCE_SUBCONTRACT.getValue())) {
+            return StringUtils.equals(resolve(orderType, materialProp), OrderType.WG.getValue()) ? 0 : 1;
+        }
+        return typeSource;
+    }
+}
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 cb62ed7..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,6 +45,15 @@
      */
     IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
 
+    /** 鏌ヨ鎸囧畾澶栧崗鍒嗙被鐨勬楠屼腑鏁版嵁銆� */
+    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);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 5257381..1c4ddaa 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -156,6 +156,8 @@
     @Resource
     private ISysDictTypeService iSysDictTypeService;
     @Resource
+    private OutsourceOrderFlowService outsourceOrderFlowService;
+    @Resource
     private InsOrderRatesService insOrderRatesService;
     @Resource
     private InsProductDeviationWarningService insProductDeviationWarningService;
@@ -1804,7 +1806,8 @@
         Integer max = insSamples.stream().mapToInt(InsSample::getQuantity).sum();
         TableRenderData tableRenderData = new TableRenderData();
         String templateName;
-        if (StringUtils.equals(OrderType.WG.getValue(), ifsInventoryQuantity.getOrderType())) {
+        if (StringUtils.equals(OrderType.WG.getValue(),
+                outsourceOrderFlowService.resolve(ifsInventoryQuantity.getOrderType(), ifsInventoryQuantity.getMaterialProp()))) {
             //杩囨护涓嶅垽瀹氱殑妫�娴嬮」
             List<SampleProductExportDto> filterItems = sampleProductDto2s.stream().filter(f -> f.getInsResult() != 3).collect(Collectors.toList());
             int maxCableTag = 5;//鍗曚釜琛ㄦ牸锛岀數缂嗛鑹叉爣璇嗘渶澶т釜鏁�
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 2328594..275e312 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -42,6 +42,7 @@
 import com.ruoyi.inspect.service.InsOrderStateService;
 import com.ruoyi.inspect.service.InsProductService;
 import com.ruoyi.inspect.service.InsSampleService;
+import com.ruoyi.inspect.service.OutsourceOrderFlowService;
 import com.ruoyi.inspect.vo.IfsOrderVO;
 import com.ruoyi.inspect.vo.InsOrderPrintingVo;
 import com.ruoyi.system.mapper.UserMapper;
@@ -93,6 +94,7 @@
     private ApplicationEventPublisher applicationEventPublisher;
     private StandardProductListMapper standardProductListMapper;
     private StructureItemParameterMapper structureItemParameterMapper;
+    private OutsourceOrderFlowService outsourceOrderFlowService;
 
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -219,6 +221,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+        initOutsourceOrderSource(insOrder);
         // todo: 涓嬪崟鍒ゆ柇鎶芥牱璁″垝鐨勫敮涓�鎬�
         if (insOrder.getQuarterItemId() != null) {
             Long quarterItemCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
@@ -545,6 +548,16 @@
         Map<String, Object> map = new HashMap<>();
 //        InsOrder insOrder = insOrderMapper.selectById(id);
         IfsOrderVO ifsOrderVO = insOrderMapper.selectOrderInfoById(id);
+        // 璇︽儏鍚屾椂杩斿洖鏈夋晥澶勭悊娴佺▼锛屼緵妫�娴嬮〉闈㈢粺涓�閫夋嫨甯冨眬鍙婃牎楠岃鍒欍��
+        if (ifsOrderVO != null) {
+            ifsOrderVO.setFlowOrderType(ifsOrderVO.getIfsOrderType());
+            if (ifsOrderVO.getIfsInventoryId() != null) {
+                IfsInventoryQuantity quantity = ifsInventoryQuantityMapper.selectById(ifsOrderVO.getIfsInventoryId());
+                if (quantity != null) {
+                    ifsOrderVO.setFlowOrderType(outsourceOrderFlowService.resolve(quantity.getOrderType(), quantity.getMaterialProp()));
+                }
+            }
+        }
         List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
         map.put("insOrder", ifsOrderVO);
         map.put("sampleProduct", list);
@@ -552,6 +565,19 @@
         List<Map<Integer, Object>> list2 = insOrderMapper.selectReportModelByOrderId(id, laboratory);
         map.put("reportModel", list2);
         return map;
+    }
+
+    /** 淇濆瓨鍓嶈鍙栫湡瀹為攢鍞鍗曪紝绾犳澶栧崗涓嬪崟鏉ユ簮锛岄伩鍏嶅墠绔紦瀛樺奖鍝嶅疄楠屽鍒嗛厤銆� */
+    private void initOutsourceOrderSource(InsOrder insOrder) {
+        if (insOrder.getIfsInventoryId() == null) {
+            return;
+        }
+        IfsInventoryQuantity quantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
+        if (quantity == null) {
+            throw new ErrorException("鎵句笉鍒伴攢鍞鍗曚俊鎭�");
+        }
+        insOrder.setTypeSource(outsourceOrderFlowService.resolveTypeSource(
+                quantity.getOrderType(), quantity.getMaterialProp(), insOrder.getTypeSource()));
     }
 
     @Override
@@ -1259,7 +1285,7 @@
         //1.鏍规嵁ifs鍩熻幏鍙栧搴斿簱浣嶉厤缃�
         IfsProperties properties = ifsApiUtils.getPropByContract(one.getContract());
         //2.鍒ゆ柇璁㈠崟绫诲瀷鏄惁涓哄師鏉愭枡
-        if(StringUtils.equals(inventoryQuantity.getOrderType(), OrderType.RAW.getValue())){
+        if(StringUtils.equals(outsourceOrderFlowService.resolve(one.getOrderType(), one.getMaterialProp()), OrderType.RAW.getValue())){
             toLocation = properties.getRawQualifiedLocation();
         }else{
             toLocation = properties.getProductQualifiedLocation();
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 798ccdc..64b87bc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -51,6 +51,7 @@
 import com.ruoyi.inspect.service.InsOrderService;
 import com.ruoyi.inspect.service.InsReportService;
 import com.ruoyi.inspect.service.RawMaterialOrderService;
+import com.ruoyi.inspect.service.OutsourceOrderFlowService;
 import com.ruoyi.inspect.vo.ProductVo;
 import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper;
 import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
@@ -114,6 +115,7 @@
     private IfsSplitOrderRecordService ifsSplitOrderRecordService;
 
     private final NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;
+    private OutsourceOrderFlowService outsourceOrderFlowService;
 
     @Override
     public Result selectStandardTreeListByPartNo(String partNo) {
@@ -167,10 +169,62 @@
         return standardTreeMapper.selectIfsPage(page, QueryWrappers.queryWrappers(ifsInventoryQuantity));
     }
 
+    /** 淇濈暀澶栧崗鍒嗙被鏌ヨ鏉′欢锛岄伩鍏嶅師鏉愭枡鍒楄〃瑕嗙洊鍒嗙被銆� */
+    @Override
+    public IPage<IfsInventoryQuantity> getOutsourceWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity) {
+        validateOutsourceType(ifsInventoryQuantity.getOrderType());
+        ifsInventoryQuantity.setIsInspect(1);
+        ifsInventoryQuantity.setState(0);
+        return standardTreeMapper.selectIfsPage(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)
+                .eq(StringUtils.isNotBlank(ifsInventoryQuantity.getMaterialProp()), "material_prop", ifsInventoryQuantity.getMaterialProp()));
+    }
+
     @Override
     public IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto) {
         ifsInventoryQuantityDto.setOrderType(OrderType.RAW.getValue());
         return standardTreeMapper.getIfsByStateOne(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto));
+    }
+
+    /** 妫�楠屼腑鍒楄〃鎸夌湡瀹炲鍗忓垎绫昏繃婊ゃ�� */
+    @Override
+    public IPage<IfsInventoryQuantityDto> getOutsourceByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto dto) {
+        validateOutsourceType(dto.getOrderType());
+        dto.setOrderState(1);
+        dto.setState(1);
+        // 鎸夐敭鍊肩簿纭瓫閫夛紝閬垮厤鈥滄垚鍝佲�濇ā绯婂尮閰嶅埌鈥滃崐鎴愬搧鈥濄��
+        return standardTreeMapper.getIfsByStateOne(page, QueryWrappers.queryWrappers(dto)
+                .eq(StringUtils.isNotBlank(dto.getMaterialProp()), "material_prop", dto.getMaterialProp()));
+    }
+
+    /** 宸叉楠屽垪琛ㄦ寜鐪熷疄澶栧崗鍒嗙被杩囨护銆� */
+    @Override
+    public IPage<IfsInventoryQuantitySupplierDto> getOutsourceByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto dto) {
+        dto.setOrderState(4);
+        dto.setState(2);
+        return getOutsourceByAll(page, dto);
+    }
+
+    /** 鍏ㄩ儴鍒楄〃淇濈暀鐪熷疄鍒嗙被鍜屾绱㈡潯浠讹紝涓嶅己鍒堕檺鍒舵楠岀姸鎬併�� */
+    @Override
+    public IPage<IfsInventoryQuantitySupplierDto> getOutsourceByAll(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto dto) {
+        validateOutsourceType(dto.getOrderType());
+        String begin = dto.getBeginDeclareDate();
+        String end = dto.getEndDeclareDate();
+        dto.setBeginDeclareDate(null);
+        dto.setEndDeclareDate(null);
+        dto.setIsInspect(1);
+        IPage<IfsInventoryQuantitySupplierDto> result = standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(dto)
+                .eq(StringUtils.isNotBlank(dto.getMaterialProp()), "material_prop", dto.getMaterialProp()), begin, end);
+        result.getRecords().forEach(r -> r.setOrderTypeName(OrderType.getLabelByValue(r.getOrderType())));
+        return result;
+    }
+
+    /** 闄愬埗澶栧崗鍒楄〃鎺ュ彛鍙兘鏌ヨ涓や釜澶栧崗鍒嗙被銆� */
+    private void validateOutsourceType(String orderType) {
+        if (!OrderType.OUTSOURCE_INCOMING.getValue().equals(orderType)
+                && !OrderType.OUTSOURCE_SUBCONTRACT.getValue().equals(orderType)) {
+            throw new ErrorException("闈炴硶鐨勫鍗忚鍗曞垎绫�");
+        }
     }
 
 
@@ -181,6 +235,7 @@
      */
     @Override
     public int inspectionReport(List<Long> ids,String orderType,String materialProp) {
+        outsourceOrderFlowService.resolve(orderType, materialProp);
         Integer userId = SecurityUtils.getUserId().intValue();
         ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
                 .in(IfsInventoryQuantity::getId, ids)
@@ -254,6 +309,7 @@
         if(!validateValue){
             throw new ErrorException("鎶ユ澶辫触锛岄潪娉曠殑閿�鍞鍗曞垎绫绘灇涓�");
         }
+        outsourceOrderFlowService.resolve(ifsInventoryQuantity.getOrderType(), ifsInventoryQuantity.getMaterialProp());
         validateUpdateBatchNo(ifsInventoryQuantity);
         //鎵规鍙峰瓧姣嶈浆澶у啓
         ifsInventoryQuantity.setUpdateBatchNo(ifsInventoryQuantity.getUpdateBatchNo().toUpperCase(Locale.ROOT));
@@ -349,10 +405,16 @@
         if (!insOrder.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY)) {
             throw new ErrorException("鍙湁杩涘巶妫�楠屾墠鑳藉厤妫�");
         }
+        // 鍏嶆涓庢甯镐笅鍗曚娇鐢ㄧ浉鍚岀殑澶栧崗鏉ユ簮瑙勫垯銆�
+        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
+        if (ifsInventoryQuantity == null) {
+            throw new ErrorException("鎵句笉鍒伴攢鍞鍗曚俊鎭�");
+        }
         insOrder.setSendTime(LocalDateTime.now());
         // 淇敼璁㈠崟琛ㄧ洿鎺ヤ负宸叉楠�
         insOrder.setState(4);
-        insOrder.setTypeSource(1);
+        insOrder.setTypeSource(outsourceOrderFlowService.resolveTypeSource(
+                ifsInventoryQuantity.getOrderType(), ifsInventoryQuantity.getMaterialProp(), 1));
 
         String code = "Y";
         // 鐢熸垚缂栧彿
@@ -383,7 +445,6 @@
         });
 
         // 鍘熸潗鏂欎笅鍗�: 濮旀墭浜哄氨鏄姤妫�浜�, 鐢熶骇鍗曚綅灏辨槸渚涘簲鍟嗗崟浣�
-        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
         Integer declareUserId = ifsInventoryQuantity.getDeclareUserId();
         User user = userMapper.selectById(declareUserId);
         // 渚涘簲鍟嗗悕绉�
@@ -475,7 +536,9 @@
 
         InsOrder insOrder = new InsOrder();
         insOrder.setState(4);
-        insOrder.setTypeSource(1);
+        // 鍒楄〃鐩存帴鍏嶆涔熸寜鐪熷疄澶栧崗鍒嗙被鍙婄墿鏂欏睘鎬х‘瀹氭潵婧愩��
+        insOrder.setTypeSource(outsourceOrderFlowService.resolveTypeSource(
+                ifsInventoryQuantity.getOrderType(), ifsInventoryQuantity.getMaterialProp(), 1));
         String code = "Y";
         // 鐢熸垚缂栧彿
         String no = numberGenerator.generateNumberWithPrefix(3,
@@ -559,6 +622,7 @@
         if(!OrderType.validateValue(ifsInventoryQuantity.getOrderType())){
             throw new ErrorException("鏂板鎶ユ淇℃伅澶辫触锛岄潪娉曠殑閿�鍞鍗曞垎绫绘灇涓�");
         }
+        outsourceOrderFlowService.resolve(ifsInventoryQuantity.getOrderType(), ifsInventoryQuantity.getMaterialProp());
         validateUpdateBatchNo(ifsInventoryQuantity);
         ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
     }
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/IfsOrderVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/IfsOrderVO.java
index 3289eab..3d36a18 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/IfsOrderVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/IfsOrderVO.java
@@ -69,6 +69,10 @@
     @ApiModelProperty("ifs璁㈠崟鍒嗙被(01raw:鍘熸潗鏂� 02wg:澶栬喘鎴愬搧)")
     private String ifsOrderType;
 
+    /** 鏍规嵁閿�鍞垎绫诲拰鐗╂枡灞炴�х‘瀹氱殑澶勭悊娴佺▼锛屼笉鏀瑰彉鐪熷疄鍒嗙被銆� */
+    @ApiModelProperty("鏈夋晥澶勭悊娴佺▼(01raw:鍘熸潗鏂� 02wg:澶栬喘鎴愬搧)")
+    private String flowOrderType;
+
     private String partNo;
 
     private String lotBatchNo;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderType.java
index de83896..dc6ac6c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderType.java
@@ -5,7 +5,9 @@
 public enum OrderType {
 
     RAW("鍘熸潗鏂�","01raw"),
-    WG("澶栬喘鎴愬搧","02wg");
+    WG("澶栬喘鎴愬搧","02wg"),
+    OUTSOURCE_INCOMING("澶栧崗璁㈠崟-鏉ユ枡鍔犲伐","03incoming"),
+    OUTSOURCE_SUBCONTRACT("澶栧崗璁㈠崟-濮斿鍔犲伐","04subcontract");
 
     private String label,value;
 

--
Gitblit v1.9.3