1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -267,7 +267,7 @@ public class CommonUserController {
 
                     }
                     if ("zt".equals(branch)) {
-                        if ("BEGIN".equals(workflowSteps.get(i).getBranchNodeLocation()) && StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())) {
+                        if (workflowSteps.get(i).getBranchNodeLocation()!= null &&"BEGIN".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())) {
                             biaoshi = 1;
                         }
                         if(biaoshi ==1){
@@ -302,8 +302,8 @@ public class CommonUserController {
                             newWorkflowSteps.add(newWorkflowStep);
                         }
 
-                        if("END".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())){
-                            biaoshi = 1;
+                        if(workflowSteps.get(i).getBranchNodeLocation()!= null &&"END".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())){
+                            biaoshi = 0;
                         }
                     }
                 } else {

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

@@ -224,6 +224,11 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      */
     @TableField(exist = false)
     private Double totalDistribution;
+    /**
+     * 合营方
+     */
+    @TableField(exist = false)
+    private String jointVentureParties;
     /**
      * 工作流ID
      */

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

@@ -244,6 +244,11 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      */
     @TableField(exist = false)
     private String warehouseNameIn;
+    /**
+     * 合营方
+     */
+    @TableField(exist = false)
+    private String jointVentureParties;
 
     /**
      * 移库入库重量（吨）

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

@@ -324,6 +324,12 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      */
     @TableField(exist = false)
     private String contractId;
+
+    /**
+     * 合营方
+     */
+    @TableField(exist = false)
+    private String jointVentureParties;
     /**
      * 折干前重量
      */

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

@@ -187,6 +187,23 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         if (!CollectionUtils.isEmpty(expenseAllocationInfos)) {
             expenseInfo.setExpenseAllocationInfoList(expenseAllocationInfos);
         }
+        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",expenseInfo.getContractNo()));
+        if(contractManagementInfo != null){
+            expenseInfo.setJointVentureParties(contractManagementInfo.getJointVentureParties());
+        }
+        else{
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",expenseInfo.getWarehouseName())
+                    .eq("comp_id",expenseInfo.getCompId()));
+            if(warehouseBaseInfo == null){
+
+            }
+            else{
+
+                expenseInfo.setJointVentureParties(warehouseBaseInfo.getJointVentureParties());
+            }
+        }
         return expenseInfo;
     }
 

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

@@ -62,8 +62,6 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Autowired
     private IWarehouseInOutInfoService warehouseInOutInfoService;
     @Autowired
-    private IContractManagementInfoService contractManagementInfoService;
-    @Autowired
     private INoticeService noticeService;
     @Autowired
     private INoticeTaskService noticeTaskService;
@@ -81,6 +79,10 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     private ITranTaskInfoService tranTaskInfoService;
     @Autowired
     private CacheComponent cacheComponent;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
     /**
      * 出入库任务新增 编辑
      *
@@ -587,6 +589,39 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             CommonStaff commonStaff = staffService.getInfo(inOutWarehouseTask.getCreateUserId());
             inOutWarehouseTask.setCreater(commonStaff.getStaffName());
         }
+        //销售出库：看销售合同
+        //采购入库：看采购合同
+        if("销售出库".equals(inOutWarehouseTask.getInOutType())||"采购入库".equals(inOutWarehouseTask.getInOutType())||"收购入库".equals(inOutWarehouseTask.getInOutType())){
+            ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    .eq("contract_no",inOutWarehouseTask.getContractNo()));
+            inOutWarehouseTask.setJointVentureParties(contractManagementInfo.getJointVentureParties());
+        }
+        //移库任务：
+        //1.常用库移库：看发货库
+        //2.临时库移库：看临时库库名关联的合同
+        else if("移库入库".equals(inOutWarehouseTask.getInOutType())||"移库出库".equals(inOutWarehouseTask.getInOutType())){
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",inOutWarehouseTask.getWarehouseName())
+                    .eq("comp_id",inOutWarehouseTask.getCompId()));
+            if(warehouseBaseInfo != null){
+                ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no",inOutWarehouseTask.getWarehouseName()));
+                if(contractManagementInfo != null){
+
+                    inOutWarehouseTask.setJointVentureParties(contractManagementInfo.getJointVentureParties());
+                }
+            }
+            else {
+                inOutWarehouseTask.setJointVentureParties(warehouseBaseInfo.getJointVentureParties());
+            }
+        }
+        //退库任务：看入货库
+        else {
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",inOutWarehouseTask.getWarehouseName())
+                    .eq("comp_id",inOutWarehouseTask.getCompId()));
+            inOutWarehouseTask.setJointVentureParties(warehouseBaseInfo.getJointVentureParties());
+        }
         return inOutWarehouseTask;
     }
 

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

@@ -1651,6 +1651,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setCreater(commonStaff.getStaffName());
                 }
             }
+            warehousingOrder1.setJointVentureParties(dataList.get(0).getJointVentureParties());
             warehousingOrder1.setWarehouseName(dataList.get(0).getWarehouseName());
             warehousingOrder1.setIssuingTime(dataList.get(0).getIssuingTime());
             warehousingOrder1.setApproveStatus(dataList.get(0).getApproveStatus());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/InOutWharehoseTaskCheckList.java

@@ -45,7 +45,7 @@ public class InOutWharehoseTaskCheckList implements IWorkflowTaskChecklist<InOut
         Map<String, Object> variableMap = new HashMap<>();
         //销售出库：看销售合同
         //采购入库：看采购合同
-        if("销售出库".equals(inOutWarehouseTask.getInOutType())||"采购入库".equals(inOutWarehouseTask.getInOutType())){
+        if("销售出库".equals(inOutWarehouseTask.getInOutType())||"采购入库".equals(inOutWarehouseTask.getInOutType())||"收购入库".equals(inOutWarehouseTask.getInOutType())){
             ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                     .eq("contract_no",inOutWarehouseTask.getContractNo()));
             variableMap.put("jointVentureParties", contractManagementInfo.getJointVentureParties());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -83,9 +83,11 @@
         w.create_user_id as createUserId,
         w.approve_status as approveStatus,
         w.batch_id as batchId,
-        w.issuing_time as issuingTime
+        w.issuing_time as issuingTime,
+        cmi.joint_venture_parties as jointVentureParties
         FROM warehousing_order w
         LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
+        LEFT JOIN contract_management_info cmi on cmi.contract_no = w.contract_no and cmi.delete_flag = '0'
         WHERE 1=1
         <if test="compId != null and compId != ''">
             and w.comp_id = #{compId}