Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

# Conflicts:
#	winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: test
+    active: prod
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:

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

@@ -209,15 +209,15 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date startDate;
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date endDate;
     /**

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

@@ -96,6 +96,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     @Autowired
     private IPaymentManagementService paymentManagementService;
     @Autowired
+    private IQualityInspectionManagementService qualityInspectionManagementService;
+    @Autowired
     private IContractInventoryDistributionService contractInventoryDistributionService;
     @Autowired
     private ICustomerInfoService customerInfoService;
@@ -353,7 +355,16 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                             .ge("settlement_date", beforeDay));
                     WarehousingOrder warehousingOrder = new WarehousingOrder();
                     warehousingOrder.setId(IdGenerator.generateUUID());
+                    Double totalMoisture=0d;
                     for (PaymentManagement paymentManagement : paymentManagementList) {
+                        QualityInspectionManagement qualityInspectionManagement=qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                        .eq("relation_id",paymentManagement.getRelationId()));
+                        if (qualityInspectionManagement!=null) {
+                            if (qualityInspectionManagement.getWaterContent()!=null) {
+                                totalMoisture = totalMoisture + Double.valueOf(qualityInspectionManagement.getWaterContent())
+                                        * Double.valueOf(String.valueOf(paymentManagement.getNetWeight() / 1000));
+                            }
+                        }
                         paymentManagement.setOrderId(warehousingOrder.getId());
                         paymentManagementService.updateById(paymentManagement);
                     }
@@ -367,6 +378,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder.setGoodsName(warehousingOrder1.getGoodsName());
                     warehousingOrder.setInType("收购入库");
                     double weight = (paymentManagementList.stream().mapToDouble(PaymentManagement::getNetWeight).sum()) / 1000;
+                    if (totalMoisture!=0) {
+                        warehousingOrder.setWeightedMoisture(totalMoisture / weight);
+                    }
                     warehousingOrder.setInWarehouseWeight(weight);
                     warehousingOrder.setSurplusWeight(weight);
                     double money = paymentManagementList.stream().mapToDouble(PaymentManagement::getAmountIngPayable).sum();
@@ -437,6 +451,21 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                             .eq("warehouse_name", warehousingOrder1.getWarehouseName())
                             .eq("in_out_type", "采购入库")
                             .ge("in_out_date", beforeDay));
+                    Double totalMoisture=0d;
+                    for (WarehouseInOutInfo warehouseInOutInfo:warehouseInOutInfoList){
+                        QualityInspectionManagement qualityInspectionManagement=qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                        .eq("warehouse_in_out_id",warehouseInOutInfo.getId()));
+                        if (qualityInspectionManagement!=null) {
+                            if (qualityInspectionManagement.getWaterContent()!=null) {
+                                totalMoisture = totalMoisture + Double.valueOf(qualityInspectionManagement.getWaterContent())
+                                        * warehouseInOutInfo.getNetWeight();
+                            }
+                            else {
+                                totalMoisture=0d;
+                                break;
+                            }
+                        }
+                    }
                     WarehousingOrder warehousingOrder = new WarehousingOrder();
                     warehousingOrder.setId(IdGenerator.generateUUID());
                     warehousingOrder.setBaseId(warehousingOrder1.getBaseId());
@@ -448,6 +477,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder.setGoodsName(warehousingOrder1.getGoodsName());
                     warehousingOrder.setContractNo(warehousingOrder1.getContractNo());
                     double weight = warehouseInOutInfoList.stream().mapToDouble(WarehouseInOutInfo::getNetWeight).sum();
+                    if (totalMoisture!=0) {
+                        warehousingOrder.setWeightedMoisture(totalMoisture / weight);
+                    }
                     warehousingOrder.setInWarehouseWeight(weight);
                     Double money = 0d;
                     for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
@@ -517,6 +549,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                             warehousingOrder.setAvgCost(warehousingOrder2.getAvgCost());
                             warehousingOrder.setCompId(warehousingOrder1.getCompId());
                             warehousingOrder.setGoodsName(warehousingOrder1.getGoodsName());
+                            warehousingOrder.setWeightedMoisture(warehousingOrder2.getWeightedMoisture());
                             warehousingOrder.setInWarehouseWeight(weight * sourceRelationInfo.getProportion());
                             warehousingOrder.setSurplusWeight(weight * sourceRelationInfo.getProportion());
                             warehousingOrder.setIssuingTime(new Date());
@@ -617,6 +650,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                             warehousingOrder.setWarehouseName(warehousingOrder1.getWarehouseName());
                             warehousingOrder.setInType("退库");
                             warehousingOrder.setContractNo(warehousingOrder2.getContractNo());
+                            warehousingOrder.setWeightedMoisture(warehousingOrder2.getWeightedMoisture());
                             //取货源入库单成本
                             warehousingOrder.setAvgCost(warehousingOrder2.getAvgCost());
                             warehousingOrder.setCompId(warehousingOrder1.getCompId());
@@ -1735,29 +1769,30 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     @Override
     public String dryOut(WarehousingOrder warehousingOrder) {
         List<WarehousingOrder> warehousingOrderList=warehousingOrder.getWarehousingOrderList();
-        Double money=0d;
+        Double afterCost=0d;
+        String goodsName=warehousingOrderList.get(0).getGoodsName().replace("（潮粮）", "");
         for (WarehousingOrder warehousingOrder1:warehousingOrderList){
-            money=money+warehousingOrder1.getSurplusWeight()*warehousingOrder1.getAvgCost();
+            afterCost=warehousingOrder1.getSurplusWeight()*warehousingOrder1.getAvgCost()/warehousingOrder1.getAfterWeight();
             warehousingOrder1.setSurplusWeight(0d);
+            warehousingOrder1.setOutWarehouseWeight(warehousingOrder1.getInWarehouseWeight());
             this.updateById(warehousingOrder1);
+            WarehousingOrder warehousingOrder2 = new WarehousingOrder();
+            warehousingOrder2.setId(IdGenerator.generateUUID());
+            warehousingOrder2.setCompId(warehousingOrder1.getCompId());
+            warehousingOrder2.setBaseId(warehousingOrder1.getBaseId());
+            warehousingOrder2.setIdentifyId(warehousingOrder1.getIdentifyId());
+            warehousingOrder2.setContractNo(warehousingOrder1.getContractNo());
+            warehousingOrder2.setMoveTaskNo(warehousingOrder1.getMoveTaskNo());
+            warehousingOrder2.setWarehouseName(warehousingOrder1.getWarehouseName());
+            warehousingOrder2.setInType("折干");
+            warehousingOrder2.setGoodsName(goodsName);
+            warehousingOrder2.setGoodsSource(warehousingOrder1.getGoodsSource());
+            warehousingOrder2.setInWarehouseWeight(warehousingOrder1.getAfterWeight());
+            warehousingOrder2.setSurplusWeight(warehousingOrder1.getAfterWeight());
+            warehousingOrder2.setIssuingTime(new Date());
+            warehousingOrder2.setAvgCost(afterCost);
+            this.insert(warehousingOrder2);
         }
-        Double afterCost=money/warehousingOrder.getAfterWeight();
-        WarehousingOrder warehousingOrder2 = new WarehousingOrder();
-        warehousingOrder2.setId(IdGenerator.generateUUID());
-        warehousingOrder2.setCompId(warehousingOrderList.get(0).getCompId());
-        warehousingOrder2.setBaseId(warehousingOrderList.get(0).getBaseId());
-        warehousingOrder2.setIdentifyId(warehousingOrderList.get(0).getIdentifyId());
-        warehousingOrder2.setContractNo(warehousingOrderList.get(0).getContractNo());
-        warehousingOrder2.setMoveTaskNo(warehousingOrderList.get(0).getMoveTaskNo());
-        warehousingOrder2.setWarehouseName(warehousingOrderList.get(0).getWarehouseName());
-        warehousingOrder2.setInType("折干");
-        warehousingOrder2.setGoodsName(warehousingOrderList.get(0).getGoodsName().replace("（潮粮）", ""));
-        warehousingOrder2.setGoodsSource(warehousingOrderList.get(0).getGoodsSource());
-        warehousingOrder2.setInWarehouseWeight(warehousingOrder.getAfterWeight());
-        warehousingOrder2.setSurplusWeight(warehousingOrder.getAfterWeight());
-        warehousingOrder2.setIssuingTime(new Date());
-        warehousingOrder2.setAvgCost(afterCost);
-        this.insert(warehousingOrder2);
         CommonSysParameter commonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", warehousingOrderList.get(0).getGoodsName()));
         //减去被折转的潮粮库存
         WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
@@ -1787,7 +1822,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
         warehouseInOutDetail.setId(IdGenerator.generateUUID());
         warehouseInOutDetailService.insert(warehouseInOutDetail);
-        CommonSysParameter commonSysParameter2 = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", warehousingOrder2.getGoodsName()));
+        CommonSysParameter commonSysParameter2 = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", goodsName));
         WarehousePositionStorageInfo warehousePositionStorageInfo1 = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                 .eq("position_id", warehousingOrder.getAfterPositionId())
                 .eq("goods_name_key", commonSysParameter2.getConstKey()));
@@ -1800,18 +1835,18 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             warehousePositionStorageInfo2.setPositionId(warehousingOrder.getAfterPositionId());
             warehousePositionStorageInfo2.setBinNumber(warehousingOrder.getAfterBinNo());
             warehousePositionStorageInfo2.setGoodsNameKey(commonSysParameter2.getConstKey());
-            warehousePositionStorageInfo2.setGoodsName(warehousingOrder2.getGoodsName());
+            warehousePositionStorageInfo2.setGoodsName(goodsName);
             warehousePositionStorageInfo2.setStorage(warehousingOrder.getAfterWeight());
             warehousePositionStorageInfoService.insert(warehousePositionStorageInfo2);
         }
         WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
         warehouseInOutInfo1.setId(IdGenerator.generateUUID());
-        warehouseInOutInfo1.setBaseId(warehousingOrder2.getBaseId());
-        warehouseInOutInfo1.setWarehouseName(warehousingOrder2.getWarehouseName());
+        warehouseInOutInfo1.setBaseId(warehouseInOutInfo.getBaseId());
+        warehouseInOutInfo1.setWarehouseName(warehouseInOutInfo.getWarehouseName());
         warehouseInOutInfo1.setPositionId(warehousingOrder.getAfterPositionId());
         warehouseInOutInfo1.setBinNumber(warehousingOrder.getAfterBinNo());
         warehouseInOutInfo1.setInOutFlag("2");
-        warehouseInOutInfo1.setGoodsName(warehousingOrder2.getGoodsName());
+        warehouseInOutInfo1.setGoodsName(goodsName);
         warehouseInOutInfo1.setGoodsNameKey(commonSysParameter2.getConstKey());
         warehouseInOutInfo1.setNetWeight(warehousingOrder.getAfterWeight());
         warehouseInOutInfo1.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());

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

@@ -515,16 +515,15 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if (contractManagementInfo==null){
                     InOutWarehouseTask inOutWarehouseTask =  inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                             .eq("comp_id",weighingManagement.getCompId())
-                            .eq("in_out_task_no",qualityInspectionManagement.getInOutTaskNo()));
-                    if(inOutWarehouseTask != null){
-                        contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                                .eq("comp_id",weighingManagement.getCompId())
-                                .eq("contract_no",inOutWarehouseTask.getSendWarehouse()));
-                        if (contractManagementInfo!=null){
+                            .eq("in_out_task_no",qualityInspectionManagement.getInOutTaskNo()!=null?qualityInspectionManagement.getInOutTaskNo():weighingManagement.getInOutTaskNo()));
+                    if (inOutWarehouseTask!=null) {
+                        contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                                .eq("comp_id", weighingManagement.getCompId())
+                                .eq("contract_no", inOutWarehouseTask.getSendWarehouse()));
+                        if (contractManagementInfo != null) {
                             weighingManagement.setContractManagement(contractManagementInfo);
                         }
                     }
-
                 }
             }
             WarehouseInOutDetail warehouseInOutDetail=warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>()

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

@@ -0,0 +1,60 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IPurchasePriceService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehousingOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "仓库管理", group = "入库单")
+public class AcquisitionCheckList implements IWorkflowTaskChecklist<PurchasePrice> {
+
+    @Autowired
+    private IPurchasePriceService purchasePriceService;
+
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    @Override
+    public List<PurchasePrice> getRecords(List<String> ids) {
+
+        return ids.stream().map(id -> purchasePriceService.selectById(id)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("jointVentureParties");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+        PurchasePrice purchasePrice = purchasePriceService.selectById(id);
+        Map<String, Object> variableMap = new HashMap<>();
+        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",purchasePrice.getWarehouseName()));
+        if(contractManagementInfo != null){
+            variableMap.put("jointVentureParties", contractManagementInfo.getJointVentureParties());
+        }
+        else{
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",purchasePrice.getWarehouseName())
+                    .eq("comp_id",purchasePrice.getCompId()));
+            variableMap.put("jointVentureParties", warehouseBaseInfo.getJointVentureParties());
+        }
+        return variableMap;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.ExpenseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IExpenseInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.ILeaveInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "费用管理", group = "费用管理")
+public class ExepenseList implements IWorkflowTaskChecklist<ExpenseInfo> {
+    @Autowired
+    private IExpenseInfoService expenseInfoService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
+    @Override
+    public List<ExpenseInfo> getRecords(List<String> ids) {
+        return ids.stream().map(id -> expenseInfoService.selectById(id)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("leaveTypeKey");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+        ExpenseInfo expenseInfo = expenseInfoService.selectById(id);
+        Map<String, Object> variableMap = new HashMap<>();
+        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",expenseInfo.getContractNo()));
+        if(contractManagementInfo != null){
+            variableMap.put("jointVentureParties", contractManagementInfo.getJointVentureParties());
+        }
+        else{
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",expenseInfo.getWarehouseName())
+                    .eq("comp_id",expenseInfo.getCompId()));
+            variableMap.put("jointVentureParties", warehouseBaseInfo.getJointVentureParties());
+        }
+        return variableMap;
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
+import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
+import com.yh.saas.plugin.yiliangyiyun.service.ILeaveInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "仓库管理", group = "出入库任务")
+public class InOutWharehoseTaskCheckList implements IWorkflowTaskChecklist<InOutWarehouseTask> {
+
+    @Autowired
+    private IInOutWarehouseTaskService iInOutWarehouseTaskService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
+
+    @Override
+    public List<InOutWarehouseTask> getRecords(List<String> ids) {
+        return ids.stream().map(id -> iInOutWarehouseTaskService.selectById(id)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("jointVentureParties");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+        InOutWarehouseTask inOutWarehouseTask = iInOutWarehouseTaskService.selectById(id);
+        Map<String, Object> variableMap = new HashMap<>();
+        //销售出库：看销售合同
+        //采购入库：看采购合同
+        if("销售出库".equals(inOutWarehouseTask.getInOutType())||"采购入库".equals(inOutWarehouseTask.getInOutType())){
+            ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    .eq("contract_no",inOutWarehouseTask.getContractNo()));
+            variableMap.put("jointVentureParties", 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){
+
+                    variableMap.put("jointVentureParties", contractManagementInfo.getJointVentureParties());
+                }
+            }
+            else {
+                variableMap.put("jointVentureParties", warehouseBaseInfo.getJointVentureParties());
+            }
+        }
+        //退库任务：看入货库
+        else {
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",inOutWarehouseTask.getWarehouseName())
+                    .eq("comp_id",inOutWarehouseTask.getCompId()));
+            variableMap.put("jointVentureParties", warehouseBaseInfo.getJointVentureParties());
+        }
+
+        return variableMap;
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.AbstractWorkflowTaskListener;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskListener;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.ILeaveInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "考勤管理", group = "请假管理")
+public class QingjiaCheckList implements IWorkflowTaskChecklist<LeaveInfo> {
+
+    @Autowired
+    private ILeaveInfoService leaveInfoService;
+
+    @Override
+    public List<LeaveInfo> getRecords(List<String> ids) {
+        return ids.stream().map(id -> leaveInfoService.selectById(id)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("leaveTypeKey");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+        LeaveInfo applyInfo = leaveInfoService.selectById(id);
+        Map<String, Object> variableMap = new HashMap<>();
+        variableMap.put("leaveTypeKey", applyInfo.getLeaveTypeKey());
+        return variableMap;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.ILeaveInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "合同管理", group = "收购合同")
+public class ShouContractCheckList implements IWorkflowTaskChecklist<ContractManagementInfo> {
+
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+
+    @Override
+    public List<ContractManagementInfo> getRecords(List<String> ids) {
+        return ids.stream().map(id -> contractManagementInfoService.selectById(id)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("jointVentureParties");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectById(id);
+        Map<String, Object> variableMap = new HashMap<>();
+        variableMap.put("jointVentureParties", contractManagementInfo.getJointVentureParties());
+        return variableMap;
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.entity.BatchReviewInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "统计报表", group = "运输结算统计")
+public class TranSettlementReportCheckList implements IWorkflowTaskChecklist<BatchReviewInfo> {
+    @Autowired
+    private ITranSettlementReportService tranSettlementReportService;
+    @Autowired
+    private IBatchReviewInfoService batchReviewInfoService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
+
+    @Override
+    public List<BatchReviewInfo> getRecords(List<String> ids) {
+
+        return ids.stream().map(id -> batchReviewInfoService.selectById(id)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("jointVentureParties");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+//        BatchReviewInfo BatchReviewInfo = batchReviewInfoService.selectById(id);
+        TranSettlementReport tranSettlementReport = tranSettlementReportService.selectOne(new EntityWrapper<TranSettlementReport>()
+                .eq("batch_id",id));
+        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",tranSettlementReport.getContractNo()));
+        Map<String, Object> variableMap = new HashMap<>();
+        variableMap.put("jointVentureParties", contractManagementInfo.getJointVentureParties());
+        return variableMap;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.google.common.collect.Lists;
+import com.yh.saas.common.support.workflow.IWorkflowTaskChecklist;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskChecklist;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehousingOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@WorkflowTaskChecklist(name = "仓库管理", group = "入库单")
+public class WarehousingOrderCheckList implements IWorkflowTaskChecklist<WarehousingOrder> {
+
+    @Autowired
+    private IWarehousingOrderService warehousingOrderService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
+
+    @Override
+    public List<WarehousingOrder> getRecords(List<String> ids) {
+
+        return ids.stream().map(id -> warehousingOrderService.selectOne(new EntityWrapper<WarehousingOrder>()
+                .eq("batch_id",id))).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getConditions() {
+        return Lists.newArrayList("jointVentureParties");
+    }
+
+    @Override
+    public Map<String, Object> getCondtionValueMap(String id) {
+        WarehousingOrder warehousingOrder = warehousingOrderService.selectOne(new EntityWrapper<WarehousingOrder>()
+        .eq("batch_id",id));
+        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehousingOrder.getBaseId());
+        Map<String, Object> variableMap = new HashMap<>();
+        variableMap.put("jointVentureParties", warehouseBaseInfo.getJointVentureParties());
+        return variableMap;
+    }
+}

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

@@ -95,11 +95,11 @@
             AND a.warehouse_name= #{warehouseName}
         </if>
         <if test="startDate != null">
-            AND (DATE_FORMAT(a.create_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%m%s") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null">
-            AND (DATE_FORMAT(a.create_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%m%s") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
         UNION ALL