提交

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

@@ -77,12 +77,12 @@ public class ContractManagementInfoController {
     /**
      * 删除
      *
-     * @param id
+     * @param example
      * @return
      */
     @PostMapping("/deleteInfo")
-    public void deleteInfo(String id) {
-        contractManagementInfoService.deleteInfo(id);
+    public void deleteInfo(@RequestBody  ContractManagementInfo example) {
+        contractManagementInfoService.deleteInfo(example.getId());
     }
 
 

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

@@ -36,7 +36,7 @@ public class WarehouseBaseInfoController {
     /**
      * 编辑仓库
      */
-    @PostMapping("/api/addWarehouse")
+    @PostMapping("/api/editWarehouse")
     public String editWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editWarehouse(warehouseBaseInfo);
     }

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

@@ -0,0 +1,43 @@
+package com.yh.saas.plugin.yiliangyiyun.entity.view;
+
+import lombok.Data;
+
+@Data
+public class WarehouseView {
+    /**
+     * 仓库名称ID
+     */
+    private String warehouseId;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 仓位编号id
+     */
+    private String binNumberId;
+    /**
+     * 仓位编号
+     */
+    private String binNumber;
+    /**
+     * 入库量
+     */
+    private String inNetWeight;
+    /**
+     * 出库量
+     */
+    private String outNetWeight;
+    /**
+     * 应余量
+     */
+    private String storage;
+    /**
+     * 容量
+     */
+    private String capacity;
+    /**
+     * 待完成数
+     */
+    private String number;
+}

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

@@ -3,16 +3,19 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousePositionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseBaseInfoMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehousePositionInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +31,46 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 
     @Autowired
     private IWarehousePositionInfoService warehousePositionInfoService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
+
+    /**
+     * 仓库管理页面列表
+     *
+     * @param compId
+     * @return
+     */
+//    @Override
+//    public List<WarehouseView> selectWarehouseViewinfo(String compId) {
+//        List<WarehouseView> warehouseViews = new ArrayList<>();
+//        // 查出所有仓库
+//        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>().eq("comp_id", compId));
+//        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+//            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+//                // 以库位为维度查询
+//                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+//                        .eq("comp_id", compId).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()));
+//                        // 查询出入库数量
+//                        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+//                        .eq("position_id",warehousePositionInfo.getId()).eq("in_out_flag",));
+//
+//                    }
+//                }
+//            }
+//
+//        }
+//
+//
+//    }
+
     /**
      * 添加仓库
      */
@@ -71,7 +114,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     @Override
     public List<WarehouseBaseInfo> selectWarehose(String compId) {
         List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
-        .eq("comp_id",compId).eq("delete_flag","0"));
+                .eq("comp_id", compId).eq("delete_flag", "0"));
         return warehouseBaseInfoList;
     }
 
@@ -79,10 +122,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      * 查看库房
      */
     @Override
-    public WarehouseBaseInfo getWarehouse(String id){
+    public WarehouseBaseInfo getWarehouse(String id) {
         WarehouseBaseInfo warehouseBaseInfo = this.selectById(id);
         List<WarehousePositionInfo> warehousePositionInfoList = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id",id));
+                .eq("base_id", id));
         warehouseBaseInfo.setWarehousePositionInfoList(warehousePositionInfoList);
         return warehouseBaseInfo;
     }