1

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

@@ -846,7 +846,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             }
         }
         //现货自运采购合同
-        if ("1".equals(contractManagementInfo.getGoodsType()) && "1".equals(contractManagementInfo.getDeliverType()) && "2".equals(contractManagementInfo.getContractType())) {
+        if ("1".equals(contractManagementInfo.getGoodsType()) && ("1".equals(contractManagementInfo.getDeliverType())||"3".equals(contractManagementInfo.getDeliverType())) && "2".equals(contractManagementInfo.getContractType())) {
             //定义出库量
             Double outWeight = 0.0d;
             //查询同名临时库出库量
@@ -1273,7 +1273,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
                     contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
                     contractManagementInfo.setSettlementPrice(settlementPrice);
-                    if ("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())) {
+                    if ("2".equals(contractManagementInfo.getContractType()) && ("1".equals(contractManagementInfo.getDeliverType())||"3".equals(contractManagementInfo.getDeliverType()))) {
                         //临时仓库信息
                         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                                 .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
@@ -1298,7 +1298,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             } else if (StatusEnum.END_OF_SHIPMENT.getFlag().equals(contractManagementInfo.getStatusFlag())) {
                 contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_COMPLETED.getFlag());
                 contractManagementInfo.setStatus(StatusEnum.CONTRACT_COMPLETED.getName());
-                if ("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())) {
+                if ("2".equals(contractManagementInfo.getContractType()) && ("1".equals(contractManagementInfo.getDeliverType())||"3".equals(contractManagementInfo.getDeliverType()))) {
                     //临时仓库信息
                     WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                             .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())
@@ -2271,7 +2271,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, id));
             contractGoodsInfoService.deleteById(contractGoodsInfo.getId());
             contractProcessInfoService.deleteById(contractProcessInfo.getId());
-            if ("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())) {
+            if ("2".equals(contractManagementInfo.getContractType()) &&("1".equals(contractManagementInfo.getDeliverType())||"3".equals(contractManagementInfo.getDeliverType())) ) {
                 //临时仓库信息
                 WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                         .eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo())