1

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

@@ -1103,7 +1103,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     contractManagementInfo1.setTaskId(taskId);
                 }
                 //现货自运采购合同
-                if ("1".equals(contractManagementInfo1.getGoodsType()) && "1".equals(contractManagementInfo1.getDeliverType()) && "2".equals(contractManagementInfo1.getContractType())) {
+                if ("1".equals(contractManagementInfo1.getGoodsType()) && ("1".equals(contractManagementInfo1.getDeliverType())||"3".equals(contractManagementInfo1.getDeliverType()) ) && "2".equals(contractManagementInfo1.getContractType())) {
                     //定义出库量
                     Double outWeight = 0.0d;
                     //查询同名临时库出库量
@@ -1132,7 +1132,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
                 }
                 //现货他运采购合同
-                else if ("1".equals(contractManagementInfo1.getGoodsType()) && ("2".equals(contractManagementInfo1.getDeliverType())||"3".equals(contractManagementInfo1.getDeliverType()) )&& "2".equals(contractManagementInfo1.getContractType())) {
+                else if ("1".equals(contractManagementInfo1.getGoodsType()) && "2".equals(contractManagementInfo1.getDeliverType())&& "2".equals(contractManagementInfo1.getContractType())) {
                     //定义出库量
                     Double inWeight = 0.0d;
                     //查询同合同编号入库量

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

@@ -2229,9 +2229,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 }
                             }
                         }
+                        //生成临时库的合同
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseBaseInfo.getWarehouseName())
-                                .eq("deliver_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo != null) {
                             //现货采购入库报表
@@ -2448,7 +2448,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReportService.insert(tranSettlementReport);
                         }
                         //他运的销售合同
-                        else if ("2".equals(contractManagementInfo1.getDeliverType())){
+                        else if ("2".equals(contractManagementInfo1.getDeliverType())||"3".equals(contractManagementInfo1.getDeliverType())){
                             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                                     .eq("contract_no", contractManagementInfo1.getContractNo())
                                     .eq("comp_id", contractManagementInfo1.getCompId()));
@@ -5711,10 +5711,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 }
                             }
                         }
-                        //自运销售合同
+                        //生成临时库的合同
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseBaseInfo.getWarehouseName())
-                                .eq("deliver_type", "1")
                                 .eq("delete_flag", "0"));
                         if (contractManagementInfo != null) {
                             //现货采购入库报表
@@ -5931,7 +5930,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReportService.insert(tranSettlementReport);
                         }
                         //他运的销售合同
-                        else if ("2".equals(contractManagementInfoSale.getDeliverType())){
+                        else if ("2".equals(contractManagementInfoSale.getDeliverType())||"3".equals(contractManagementInfoSale.getDeliverType())){
                             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                                     .eq("contract_no", contractManagementInfoSale.getContractNo())
                                     .eq("comp_id", contractManagementInfoSale.getCompId()));