出入库合同编号下拉列表

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

@@ -1,7 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -86,5 +88,15 @@ public class WarehouseInOutInfoController {
         return warehouseInOutInfoService.selectInfoTemporary(warehouseInOutInfo);
     }
 
+    /**
+     * 出入库合同编号下拉列表
+     * @param compId
+     * @return
+     */
+    @GetMapping("/selectContractNoList")
+    public List<ContractManagementInfo> selectContractNoList(String compId) {
+        return warehouseInOutInfoService.selectContractNoList(compId);
+    }
+
 }
 

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

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
 /**
  * <p>
  * 记录出入库信息 服务类
@@ -52,4 +56,11 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
      */
     Page<WarehouseInOutInfo> selectInfoTemporary(WarehouseInOutInfo warehouseInOutInfo);
 
+    /**
+     * 出入库合同编号下拉列表
+     *
+     * @param compId
+     */
+    List<ContractManagementInfo> selectContractNoList(String compId);
+
 }

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

@@ -258,10 +258,12 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 warehouseBaseInfoService.deleteById(warehouseBaseInfo.getId());
                 //临时库出入库信息
                 List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>().eq("base_id",warehouseBaseInfo.getId()));
-                for(WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos ){
+                if(!CollectionUtils.isEmpty(warehouseInOutInfos)){
+                    for(WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos ){
                     warehouseInOutInfoService.deleteById(warehouseInOutInfo.getId());
-                }
+                     }
 
+                }
             }
 
         }

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

@@ -47,6 +47,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     private IWarehouseBaseInfoService warehouseBaseInfoService;
     @Autowired
     private IWarehousePositionInfoService warehousePositionInfoService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
 
     /**
      * 待完成页面列表
@@ -312,4 +314,17 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         page.setSize(warehouseInOutInfo.getPageSize());
         return page;
     }
+
+    /**
+     * 出入库合同编号下拉列表
+     *
+     * @param compId
+     * @return
+     */
+    @Override
+    public List<ContractManagementInfo> selectContractNoList(String compId) {
+        List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
+                .eq("comp_id",compId).eq("delete_flag","0"));
+        return contractManagementInfoList;
+    }
 }