临时

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

@@ -53,8 +53,8 @@ public class WarehouseBaseInfoController {
      * 查看库房下拉列表
      */
     @GetMapping("/selectWarehouse")
-    public List<WarehouseBaseInfo> selectWarehouse(@RequestParam String compId){
-        return warehouseBaseInfoService.selectWarehouse(compId);
+    public List<WarehouseBaseInfo> selectWarehouse(@RequestParam String compId,String warehouseType){
+        return warehouseBaseInfoService.selectWarehouse(compId,warehouseType);
     }
     /**
      * 查看库房
@@ -71,8 +71,8 @@ public class WarehouseBaseInfoController {
      * @return
      */
     @GetMapping("/selectWarehouseViewinfo")
-    public List<WarehouseView> selectWarehouseViewinfo(String compId,String warehouseName){
-        return warehouseBaseInfoService.selectWarehouseViewinfo(compId,warehouseName);
+    public List<WarehouseView> selectWarehouseViewinfo(String compId,String warehouseName,String warehouseType){
+        return warehouseBaseInfoService.selectWarehouseViewinfo(compId,warehouseName,warehouseType);
     }
 
     /**

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

@@ -37,6 +37,15 @@ public class WarehouseInOutInfoController {
     public Page<WarehouseInOutInfo> selectWarehouseInOutInfo(WarehouseInOutInfo warehouseInOutInfo){
         return warehouseInOutInfoService.selectWarehouseInOutInfo(warehouseInOutInfo);
     }
+    /**
+     * 待完成页面分页列表查询(临时库)
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @GetMapping("/selectWarehouseInOutInfoTemporary")
+    public Page<WarehouseInOutInfo> selectWarehouseInOutInfoTemporary(WarehouseInOutInfo warehouseInOutInfo){
+        return warehouseInOutInfoService.selectWarehouseInOutInfoTemporary(warehouseInOutInfo);
+    }
 
     /**
      * 删除记录
@@ -67,5 +76,15 @@ public class WarehouseInOutInfoController {
         return warehouseInOutInfoService.selectInfo(warehouseInOutInfo);
     }
 
+    /**
+     * 流转记录查询(临时库)
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @GetMapping("/selectInfoTemporary")
+    public Page<WarehouseInOutInfo> selectInfoTemporary(WarehouseInOutInfo warehouseInOutInfo) {
+        return warehouseInOutInfoService.selectInfoTemporary(warehouseInOutInfo);
+    }
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -194,7 +194,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
     /**
      * 最终实际交易量
      */
-    private String finalTradingVolume;
+    private Float finalTradingVolume;
 
     /**
      * 货名

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -45,7 +45,7 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      */
     private String warehouseName;
     /**
-     * 仓库类型
+     * 仓库类型(1 自有库 2 临时库)
      */
     private String warehouseType;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/WarehouseView.java

@@ -50,4 +50,8 @@ public class WarehouseView {
      * 备注
      */
     private String remark;
+    /**
+     * 临时库地址
+     */
+    private String address;
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseInOutInfoMapper.java

@@ -31,5 +31,20 @@ public interface WarehouseInOutInfoMapper extends BaseMapper<WarehouseInOutInfo>
      * @return
      */
     List<WarehouseInOutInfo> getListByCondition(Map<String, Object> pageView);
+    /**
+     * 根据条件流转记录总数(临时库)
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByConditionTemporary(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询流转记录列表(临时库)
+     *
+     * @param pageView
+     * @return
+     */
+    List<WarehouseInOutInfo> getListByConditionTemporary(Map<String, Object> pageView);
 
 }

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

@@ -39,7 +39,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouse(String compId);
+    List<WarehouseBaseInfo> selectWarehouse(String compId,String warehouseType);
 
     /**
      * 查看库房
@@ -52,7 +52,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @param compId
      * @return
      */
-    List<WarehouseView> selectWarehouseViewinfo(String compId,String warehouseName);
+    List<WarehouseView> selectWarehouseViewinfo(String compId,String warehouseName,String warehouseType);
 
     /**
      * 更改显示状态

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

@@ -19,6 +19,13 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
      * @return
      */
     Page<WarehouseInOutInfo> selectWarehouseInOutInfo(WarehouseInOutInfo warehouseInOutInfo);
+    /**
+     * 待完成页面列表(临时库)
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    Page<WarehouseInOutInfo> selectWarehouseInOutInfoTemporary(WarehouseInOutInfo warehouseInOutInfo);
     /**
      * 删除记录
      */
@@ -37,4 +44,12 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
      */
     Page<WarehouseInOutInfo> selectInfo(WarehouseInOutInfo warehouseInOutInfo);
 
+    /**
+     * 流转记录分页查询(临时库)
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    Page<WarehouseInOutInfo> selectInfoTemporary(WarehouseInOutInfo warehouseInOutInfo);
+
 }

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

@@ -47,117 +47,206 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      * @return
      */
     @Override
-    public List<WarehouseView> selectWarehouseViewinfo(String compId, String warehouseName) {
+    public List<WarehouseView> selectWarehouseViewinfo(String compId, String warehouseName,String warehouseType) {
         List<WarehouseView> warehouseViews = new ArrayList<>();
         Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
-        warehouseBaseInfoWrapper.eq("comp_id", compId).eq("delete_flag", "0").eq("show_flag", "1");
+        warehouseBaseInfoWrapper.eq("comp_id", compId).eq("delete_flag", "0").eq("show_flag", "1").eq("warehouse_type",warehouseType);;
         if (!StringUtils.isEmpty(warehouseName)) {
             warehouseBaseInfoWrapper.like("warehouse_name", "%" + warehouseName + "%");
         }
         // 查出所有仓库
         List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
-        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
-            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-                // 以库位为维度查询
-                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("base_id", warehouseBaseInfo.getId()));
-                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
-                    for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
-                        WarehouseView warehouseView = new WarehouseView();
-                        warehouseView.setWarehouseId(warehouseBaseInfo.getId());
-                        warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
-                        warehouseView.setBinNumberId(warehousePositionInfo.getId());
-                        warehouseView.setBinNumber(warehousePositionInfo.getBinNumber());
-                        warehouseView.setCapacity(String.valueOf(warehousePositionInfo.getMaxStorage()));
-                        warehouseView.setRemark(warehousePositionInfo.getRemark());
-                        // 定义待完成数量
-                        int count = 0;
-                        // 定义应余量
-                        String storage = "";
-                        //定义入库
-                        String inNetWeight = "";
-                        // 子集合
-                        List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
-                        // 查询入库数量
-                        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
-                        if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
-                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                                WarehouseNumView warehouseNumView = new WarehouseNumView();
-                                // 查询入库数量
-                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2")
-                                        .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
-
-                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
-                                    Float netWeight = 0f;
-                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                        netWeight = netWeight + warehouse.getNetWeight();
+        if (warehouseType.equals("1")) {
+            if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+                for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                    // 以库位为维度查询
+                    List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId()));
+                    if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                        for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
+                            WarehouseView warehouseView = new WarehouseView();
+                            warehouseView.setWarehouseId(warehouseBaseInfo.getId());
+                            warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                            warehouseView.setBinNumberId(warehousePositionInfo.getId());
+                            warehouseView.setBinNumber(warehousePositionInfo.getBinNumber());
+                            warehouseView.setCapacity(String.valueOf(warehousePositionInfo.getMaxStorage()));
+                            warehouseView.setRemark(warehousePositionInfo.getRemark());
+                            // 定义待完成数量
+                            int count = 0;
+                            // 定义应余量
+                            String storage = "";
+                            //定义入库
+                            String inNetWeight = "";
+                            // 子集合
+                            List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
+                            // 查询入库数量
+                            List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("position_id", warehousePositionInfo.getId()).eq("status_flag","3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                                    WarehouseNumView warehouseNumView = new WarehouseNumView();
+                                    // 查询入库数量
+                                    List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                            .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2")
+                                            .eq("status_flag","3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+
+                                    if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                        Float netWeight = 0f;
+                                        for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                            netWeight = netWeight + warehouse.getNetWeight();
+                                        }
+                                        warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
+                                        warehouseNumView.setInNetWeight(String.valueOf(netWeight));
+                                        if(StringUtils.isEmpty(inNetWeight)){
+                                            inNetWeight = "0";
+                                        }
+                                        inNetWeight = String.valueOf(Float.valueOf(inNetWeight)  + netWeight);
                                     }
-                                    warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
-                                    warehouseNumView.setInNetWeight(String.valueOf(netWeight));
-                                    if (StringUtils.isEmpty(inNetWeight)) {
-                                        inNetWeight = "0";
+                                    // 查询应余量
+                                    WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                                            .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    if (warehousePositionStorageInfo!=null) {
+                                        storage = String.valueOf(warehousePositionStorageInfo.getStorage());
                                     }
-                                    inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
+                                    else{
+                                        storage = "";
+                                    }
+                                    warehouseNumView.setStorage(storage);
+                                    warehouseNumViewList.add(warehouseNumView);
                                 }
-                                // 查询应余量
-                                WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                                        .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
-                                if (warehousePositionStorageInfo != null) {
-                                    storage = String.valueOf(warehousePositionStorageInfo.getStorage());
-                                } else {
-                                    storage = "";
+
+                            }
+
+                            //定义出库
+                            String outNetWeight = "";
+                            // 查询出库数量
+                            List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("position_id", warehousePositionInfo.getId()).eq("status_flag","3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                                    Float netWeight = 0f;
+                                    outNetWeight = "0";
+                                    List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                            .eq("status_flag","3").eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                        for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                            netWeight = netWeight + warehouse.getNetWeight();
+                                        }
+                                        if(StringUtils.isEmpty(outNetWeight)){
+                                            outNetWeight = "0";
+                                        }
+                                        outNetWeight = String.valueOf(Float.valueOf(outNetWeight)  + netWeight);
+                                    }
+                                    for(WarehouseNumView warehouseNumView : warehouseNumViewList){
+                                        if(warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())){
+                                            warehouseNumView.setOutNetWeight(outNetWeight);
+                                        }
+
+                                    }
                                 }
-                                warehouseNumView.setStorage(storage);
-                                warehouseNumViewList.add(warehouseNumView);
+
                             }
+                            // 查询入库数量
+                            count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("position_id", warehousePositionInfo.getId())
+                                    .eq("status_flag","1"));
+                            warehouseView.setNumber(count);
+                            warehouseView.setWarehouseNumViewList(warehouseNumViewList);
+                            warehouseViews.add(warehouseView);
 
                         }
+                    }
+                }
+
+            }
+
+        }
+        else{
+            if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+                for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                    WarehouseView warehouseView = new WarehouseView();
+                    warehouseView.setWarehouseId(warehouseBaseInfo.getId());
+                    warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                    warehouseView.setAddress(warehouseBaseInfo.getWarehousePrivate()+warehouseBaseInfo.getWarehouseCity()+warehouseBaseInfo.getWarehouseArea()+warehouseBaseInfo.getDetailedAddress());
+                    // 定义待完成数量
+                    int count = 0;
+                    // 定义应余量
+                    String storage = "";
+                    //定义入库
+                    String inNetWeight = "";
+                    // 子集合
+                    List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
+                    // 查询入库数量
+                    List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag","3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                            WarehouseNumView warehouseNumView = new WarehouseNumView();
+                            // 查询入库数量
+                            List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "2")
+                                    .eq("status_flag","3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
 
-                        //定义出库
-                        String outNetWeight = "";
-                        // 查询出库数量
-                        List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
-                        if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
-                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                 Float netWeight = 0f;
-                                outNetWeight = "0";
-                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("status_flag", "3").eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
-                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
-                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                        netWeight = netWeight + warehouse.getNetWeight();
-                                    }
-                                    if (StringUtils.isEmpty(outNetWeight)) {
-                                        outNetWeight = "0";
-                                    }
-                                    outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
+                                for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                    netWeight = netWeight + warehouse.getNetWeight();
                                 }
-                                for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
-                                    if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
-                                        warehouseNumView.setOutNetWeight(outNetWeight);
-                                    }
+                                warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
+                                warehouseNumView.setInNetWeight(String.valueOf(netWeight));
+                                if(StringUtils.isEmpty(inNetWeight)){
+                                    inNetWeight = "0";
+                                }
+                                inNetWeight = String.valueOf(Float.valueOf(inNetWeight)  + netWeight);
+                            }
+                            warehouseNumViewList.add(warehouseNumView);
+                        }
 
+                    }
+
+                    //定义出库
+                    String outNetWeight = "";
+                    // 查询出库数量
+                    List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag","3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                    if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                            Float netWeight = 0f;
+                            outNetWeight = "0";
+                            List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("status_flag","3").eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                    netWeight = netWeight + warehouse.getNetWeight();
+                                }
+                                if(StringUtils.isEmpty(outNetWeight)){
+                                    outNetWeight = "0";
                                 }
+                                outNetWeight = String.valueOf(Float.valueOf(outNetWeight)  + netWeight);
                             }
+                            for(WarehouseNumView warehouseNumView : warehouseNumViewList){
+                                if(warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())){
+                                    warehouseNumView.setOutNetWeight(outNetWeight);
+                                }
 
+                            }
                         }
-                        // 查询入库数量
-                        count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("position_id", warehousePositionInfo.getId())
-                                .eq("status_flag", "1"));
-                        warehouseView.setNumber(count);
-                        warehouseView.setWarehouseNumViewList(warehouseNumViewList);
-                        warehouseViews.add(warehouseView);
 
                     }
+                    // 查询入库数量
+                    count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId())
+                            .eq("status_flag","1"));
+                    warehouseView.setNumber(count);
+                    warehouseView.setWarehouseNumViewList(warehouseNumViewList);
+                    warehouseViews.add(warehouseView);
+
                 }
             }
 
         }
 
+
         return warehouseViews;
     }
 
@@ -223,17 +312,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     @Override
     public String editWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
         this.updateById(warehouseBaseInfo);
-        List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
-        if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
-            warehousePositionInfoList.forEach(warehousePositionInfo -> {
-                if (StringUtils.isEmpty(warehousePositionInfo.getId())) {
-                    warehousePositionInfo.setId(IdGenerator.generateUUID());
-                    warehousePositionInfo.setBaseId(warehouseBaseInfo.getId());
-                    warehousePositionInfoService.insert(warehousePositionInfo);
-                } else {
-                    warehousePositionInfoService.updateById(warehousePositionInfo);
-                }
-            });
+        if (warehouseBaseInfo.getWarehouseType().equals("1")){
+            List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
+            if (!CollectionUtils.isEmpty(warehousePositionInfoList)){
+                warehousePositionInfoList.forEach(warehousePositionInfo -> {
+                    if(StringUtils.isEmpty(warehousePositionInfo.getId())){
+                        warehousePositionInfo.setId(IdGenerator.generateUUID());
+                        warehousePositionInfo.setBaseId(warehouseBaseInfo.getId());
+                        warehousePositionInfoService.insert(warehousePositionInfo);
+                    }
+                    else{
+                        warehousePositionInfoService.updateById(warehousePositionInfo);
+                    }
+                });
+            }
         }
         return warehouseBaseInfo.getId();
     }
@@ -244,9 +336,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      * @return
      */
     @Override
-    public List<WarehouseBaseInfo> selectWarehouse(String compId) {
+    public List<WarehouseBaseInfo> selectWarehouse(String compId,String warehouseType) {
         List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
-                .eq("comp_id", compId).eq("delete_flag", "0"));
+                .eq("comp_id", compId).eq("warehouse_type", warehouseType).eq("delete_flag", "0"));
         return warehouseBaseInfoList;
     }
 
@@ -342,26 +434,29 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         //查询仓库信息
         WarehouseBaseInfo warehouseBaseInfo = this.selectById(id);
         this.deleteById(warehouseBaseInfo.getId());
-        //查询仓位信息
-        List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id", warehouseBaseInfo.getId()));
-        if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
-            for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
-                warehousePositionInfoService.deleteById(warehousePositionInfo.getId());
-                //查询仓位存储量
-                List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
-                        .eq("position_id", warehousePositionInfo.getId()));
-                if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)) {
-                    for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfos) {
-                        //判断是否有剩余库存
-                        if (warehousePositionStorageInfo.getStorage() > 0) {
-                            throw new YException(YExceptionEnum.WAREHOSE_SYSTEM_ERROR);
-                        } else {
-                            warehousePositionStorageInfoService.deleteById(warehousePositionStorageInfo.getId());
+        if(warehouseBaseInfo.getWarehouseType().equals("1")){
+            //查询仓位信息
+            List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                    .eq("base_id", warehouseBaseInfo.getId()));
+            if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
+                    warehousePositionInfoService.deleteById(warehousePositionInfo.getId());
+                    //查询仓位存储量
+                    List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
+                            .eq("position_id", warehousePositionInfo.getId()));
+                    if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)) {
+                        for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfos) {
+                            //判断是否有剩余库存
+                            if (warehousePositionStorageInfo.getStorage() > 0) {
+                                throw new YException(YExceptionEnum.WAREHOSE_SYSTEM_ERROR);
+                            } else {
+                                warehousePositionStorageInfoService.deleteById(warehousePositionStorageInfo.getId());
+                            }
                         }
                     }
                 }
             }
         }
+
     }
 }

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

@@ -83,6 +83,39 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         return warehouseInOutInfoPage;
     }
 
+    /**
+     * 待完成页面列表(临时库)
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @Override
+    public Page<WarehouseInOutInfo> selectWarehouseInOutInfoTemporary(WarehouseInOutInfo warehouseInOutInfo) {
+        //查询页面信息
+        Page<WarehouseInOutInfo> warehouseInOutInfoPage = this.selectPage(warehouseInOutInfo.getQueryPage(), new EntityWrapper<WarehouseInOutInfo>()
+                .eq("base_id", warehouseInOutInfo.getBaseId())
+                .eq("status_flag",StatusEnum.TEMPORARILY_STORED.getFlag())
+                .orderBy("update_date",true));
+        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoPage.getRecords();
+        if (warehouseInOutInfoList!=null){
+            for (WarehouseInOutInfo warehouseInOutInfo1 : warehouseInOutInfoList) {
+                //查询化验数据
+                Wrapper<WarehouseInOutDetail> warehouseInOutDetailWrapper = new EntityWrapper<>();
+                warehouseInOutDetailWrapper.eq("info_id", warehouseInOutInfo1.getId());
+                warehouseInOutDetailWrapper.eq("delete_flag", "0");
+                WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(warehouseInOutDetailWrapper);
+                warehouseInOutInfo1.setWarehouseInOutDetail(warehouseInOutDetail);
+            }
+        }
+        warehouseInOutInfoPage.setRecords(warehouseInOutInfoList);
+        //查询总数
+        Integer count=this.selectCount( new EntityWrapper<WarehouseInOutInfo>()
+                .eq("base_id", warehouseInOutInfo.getBaseId())
+                .eq("status_flag",StatusEnum.TEMPORARILY_STORED.getFlag()));
+        warehouseInOutInfoPage.setSize(count);
+        return warehouseInOutInfoPage;
+    }
+
     /**
      * 删除
      *
@@ -252,4 +285,31 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         page.setSize(warehouseInOutInfo.getPageSize());
         return page;
     }
+
+    /**
+     * 流转记录查询(临时库)
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @Override
+    public Page<WarehouseInOutInfo> selectInfoTemporary(WarehouseInOutInfo warehouseInOutInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (warehouseInOutInfo.getCurrentPage() - 1)
+                * warehouseInOutInfo.getPageSize());
+        //  仓库ID
+        pageView.put("baseId", warehouseInOutInfo.getBaseId());
+        pageView.put("searchType", warehouseInOutInfo.getSearchType());
+        pageView.put("pageSize", warehouseInOutInfo.getPageSize());
+        pageView.put("currentPage", warehouseInOutInfo.getCurrentPage());
+        // 查询记录总数
+        Integer dataCount = baseMapper.getCountByConditionTemporary(pageView);
+        List<WarehouseInOutInfo> dataList = baseMapper.getListByConditionTemporary(pageView);
+        Page<WarehouseInOutInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(warehouseInOutInfo.getCurrentPage());
+        page.setSize(warehouseInOutInfo.getPageSize());
+        return page;
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -66,4 +66,67 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+    <!-- 获得流转记录总数(临时库) -->
+    <select id="getCountByConditionTemporary" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(w.id)
+        FROM warehouse_in_out_info w
+        left join warehouse_in_out_detail d on w.id=d.info_id
+        WHERE
+        w.base_id = #{baseId}
+        and w.delete_flag = '0'
+        and w.status_flag = '3'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 2">
+                AND w.in_out_flag = '1'
+            </if>
+            <if test="searchType == 3">
+                AND w.in_out_flag = '2'
+            </if>
+        </if>
+    </select>
+    <!-- 流转记录列表查询(临时库) -->
+    <select id="getListByConditionTemporary" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo">
+        SELECT
+        w.id,
+        w.goods_name as goodsName,
+        w.gross_weight as grossWeight,
+        w.tare,
+        w.net_weight as netWeight,
+        w.grade,
+        w.in_out_date as inOutDate,
+        w.in_out_type as inOutType,
+        w.contract_no as contractNo,
+        w.car_no as carNo,
+        w.agent,
+        w.back_office as backOffice,
+        w.create_date as createDate,
+        d.water_content as waterContent,
+        d.bulk_density as bulkDensity,
+        d.jiaorenli as jiaorenli,
+        d.impurity as impurity,
+        d.mildew_grain as mildewGrain,
+        d.imperfect_grain as imperfectGrain,
+        d.quality_inspector as qualityInspector,
+        w.address_url as addressUrl
+        FROM warehouse_in_out_info w
+        left join warehouse_in_out_detail d on w.id=d.info_id
+        WHERE
+        w.base_id = #{baseId}
+        and w.delete_flag = '0'
+        and w.status_flag = '3'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND w.in_out_flag = '1'
+            </if>
+            <if test="searchType == 2">
+                AND w.in_out_flag = '2'
+            </if>
+        </if>
+        ORDER BY w.update_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>