1

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

@@ -187,8 +187,8 @@ public class ContractManagementInfoController {
      * 出库根据合同号查信息
      */
     @GetMapping("/getOutContract")
-    public ContractManagementInfo getOutContract(@RequestParam String contractNo,String compId) {
-        return contractManagementInfoService.getOutContract(contractNo,compId);
+    public ContractManagementInfo getOutContract(@RequestParam String contractNo,String warehouseName,String compId) {
+        return contractManagementInfoService.getOutContract(contractNo,warehouseName,compId);
     }
     /**
      * 入库根据合同号查信息

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

@@ -141,7 +141,7 @@ public interface IContractManagementInfoService extends IService<ContractManagem
      *
      * @param contractNo,compId
      */
-    ContractManagementInfo getOutContract(String contractNo,String compId);
+    ContractManagementInfo getOutContract(String contractNo,String warehouseName,String compId);
     /**
      * 入库根据合同号查信息
      *

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

@@ -2975,7 +2975,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     }
 
     @Override
-    public ContractManagementInfo getOutContract(String contractNo, String compId) {
+    public ContractManagementInfo getOutContract(String contractNo, String warehouseName,String compId) {
         ContractManagementInfo contractManagementInfo = this.selectOne(new EntityWrapper<ContractManagementInfo>()
                 .eq("comp_id", compId)
                 .eq("delete_flag", "0")
@@ -2985,19 +2985,24 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         if (contractManagementInfo!=null){
             ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                     .eq("contract_id", contractManagementInfo.getId()));
-            //查合同下的车牌号,出库只能查到未出库的
-            List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                    .eq("contract_no", contractManagementInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
-                    .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
-            if (!org.springframework.util.CollectionUtils.isEmpty(tranCarInfoList)) {
-                contractManagementInfo.setTranCarInfoList(tranCarInfoList);
-            }
-            List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                    .eq("contract_no", contractManagementInfo.getContractNo())
-                    .eq("fleet_flag", "1")
-                    .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
-            if (!org.springframework.util.CollectionUtils.isEmpty(tranCarInfoList1)) {
-                contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
+            TranTaskInfo tranTaskInfo =tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
+            .eq("send_warehouse",warehouseName)
+            .eq("contract_no", contractManagementInfo.getContractNo()));
+            if (tranTaskInfo!=null){
+                //查合同下的车牌号,出库只能查到未出库的
+                List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("info_id", tranTaskInfo.getId()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
+                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList)) {
+                    contractManagementInfo.setTranCarInfoList(tranCarInfoList);
+                }
+                List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", contractManagementInfo.getContractNo())
+                        .eq("fleet_flag", "1")
+                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
+                    contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
+                }
             }
             //查船名
             Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
@@ -3038,19 +3043,24 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             if (inOutWarehouseTask != null) {
                 ContractManagementInfo contractManagementInfo1 = new ContractManagementInfo();
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo1);
-                //查移库任务编号下的车牌号，移库出库只能查到未出库的
-                List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
-                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
-                if (!org.springframework.util.CollectionUtils.isEmpty(tranCarInfoList)) {
-                    contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
-                }
-                List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
-                        .eq("fleet_flag", "1")
-                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
-                if (!org.springframework.util.CollectionUtils.isEmpty(tranCarInfoList1)) {
-                    contractManagementInfo1.setTranCarInfoList1(tranCarInfoList1);
+                TranTaskInfo tranTaskInfo =tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
+                        .eq("send_warehouse",warehouseName)
+                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()));
+                if (tranTaskInfo!=null){
+                    //查移库任务编号下的车牌号，移库出库只能查到未出库的
+                    List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                            .eq("info_id", tranTaskInfo.getId()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
+                            .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                    if (!CollectionUtils.isEmpty(tranCarInfoList)) {
+                        contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
+                    }
+                    List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                            .eq("info_id", tranTaskInfo.getId())
+                            .eq("fleet_flag", "1")
+                            .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
+                    if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
+                        contractManagementInfo1.setTranCarInfoList1(tranCarInfoList1);
+                    }
                 }
                 //查船名
                 Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();