1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrder.java

@@ -42,6 +42,10 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 仓库id
      */
     private String baseId;
+    /**
+     * 公司id
+     */
+    private String compId;
     /**
      * 客户id
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1,10 +1,13 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehousingOrderMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
@@ -113,7 +116,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 * warehousingOrder.getPageSize());
         List<String> businessKeys = null;
         if ("2".equals(warehousingOrder.getSearchType())) {
-            businessKeys = workflowService.getTaskBusinessKeysByCode("COLLECTION-WAREHOUSING-RECORD");
+            businessKeys = workflowService.getTaskBusinessKeysByCode("WAREHOUSING-ORDER-APPROVE");
         }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();
@@ -356,30 +359,6 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setGoodsName(warehouseInOutInfo.getGoodsName());
                 warehousingOrder.setContractNo(warehouseInOutInfo.getContractNo());
                 warehousingOrder.setInWarehouseWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-//                boolean isStartWorkflow = StringUtils.isBlank(warehousingOrder.getWorkflowId());
-//                // 不是退回的单子
-//                if (isStartWorkflow) {
-//                    Workflow workflow = workflowService
-//                            .findLatestWorkflowByBusinessCodeByApp(paymentManagement.getCompId(), "SALE-CONTRACT-APPROVE");
-//                    // 没配置审核流程，直接结束并处理信息
-//                    if (workflow == null) {
-//                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-//                    }
-//                    // 开启审核流
-//                    else {
-//
-//                        // 设置状态 已提交审核
-//                        warehousingOrder.setWorkflowId(workflow.getId());
-//                        this.updateById(warehousingOrder);
-//                        workflowService.startInstance(workflow.getId(), warehousingOrder.getId());
-//                    }
-//                }
-//                // 退回的单子 再启用
-//                else {
-//
-//                    this.updateById(warehousingOrder);
-//                    workflowService.activateInstance(warehousingOrder.getWorkflowId(), warehousingOrder.getId());
-//                }
                 this.insert(warehousingOrder);
             }
         }
@@ -430,6 +409,29 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             //请款
             else {
                 for (WarehousingOrder warehousingOrder1 : warehousingOrderList) {
+                boolean isStartWorkflow = StringUtils.isBlank(warehousingOrder1.getWorkflowId());
+                // 不是退回的单子
+                if (isStartWorkflow) {
+                    Workflow workflow = workflowService
+                            .findLatestWorkflowByBusinessCodeByApp(warehousingOrder1.getCompId(), "WAREHOUSING-ORDER-APPROVE");
+                    // 没配置审核流程，直接结束并处理信息
+                    if (workflow == null) {
+                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                    }
+                    // 开启审核流
+                    else {
+
+                        // 设置状态 已提交审核
+                        warehousingOrder1.setWorkflowId(workflow.getId());
+                        this.updateById(warehousingOrder1);
+                        workflowService.startInstance(workflow.getId(), warehousingOrder1.getId());
+                    }
+                }
+                // 退回的单子 再启用
+                else {
+                    this.updateById(warehousingOrder1);
+                    workflowService.activateInstance(warehousingOrder1.getWorkflowId(), warehousingOrder1.getId());
+                }
                     this.updateById(warehousingOrder1);
                 }
             }