1

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

@@ -1749,7 +1749,6 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if ("1".equals(warehouseBaseInfo.getCreateType())) {
                     ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                             .eq("contract_no", warehouseBaseInfo.getWarehouseName())
-                            .eq("deliver_type", "1")
                             .eq("delete_flag", "0"));
                     if (contractManagementInfo1 != null) {
                         //现货采购入库报表
@@ -1964,7 +1963,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                         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()));