提交

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

@@ -9,7 +9,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+import java.util.List;
 /**
  * <p>
  * 记录出入库信息 前端控制器
@@ -21,10 +25,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/warehouseInOutInfo")
 public class WarehouseInOutInfoController {
-
     @Autowired
     private IWarehouseInOutInfoService warehouseInOutInfoService;
+    /**
+     * 待完成页面分页列表查询
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @GetMapping("/selectWarehouseInOutInfo")
+    public Page<WarehouseInOutInfo> selectWarehouseInOutInfo(@RequestBody WarehouseInOutInfo warehouseInOutInfo){
+        return warehouseInOutInfoService.selectWarehouseInOutInfo(warehouseInOutInfo);
+    }
+    /**
+     * 删除记录
+     * @param example
+     */
+    @PostMapping("/api/deleteWarehouse")
+    public void deleteWarehouse(@RequestBody WarehouseInOutInfo example){
+        warehouseInOutInfoService.deleteWarehouse(example.getId());
+    }
 
+    /**
+     * 出入库
+     * @param warehouseInOutInfo
+     * @return
+     */
     @GetMapping("/InOutWarehouse")
     public String InOutWarehouse (@RequestBody WarehouseInOutInfo warehouseInOutInfo){
         return warehouseInOutInfoService.InOutWarehouse(warehouseInOutInfo);

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

@@ -10,10 +10,12 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -120,6 +122,14 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      * 状态
      */
     private String status;
+    /**
+     * 内勤
+     */
+    private String backOffice;
+
+
+    @TableField(exist = false)
+    private WarehouseInOutDetail warehouseInOutDetail;
 
     @TableField(exist = false)
     private WarehouseInOutDetail warehouseInOutDetail;

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

@@ -1,8 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 
+import java.util.List;
 /**
  * <p>
  * 记录出入库信息 服务类
@@ -12,6 +15,17 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2021-05-21
  */
 public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo> {
+    /**
+     * 待完成页面列表
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    Page<WarehouseInOutInfo> selectWarehouseInOutInfo(WarehouseInOutInfo warehouseInOutInfo);
+    /**
+     * 删除记录
+     */
+    void deleteWarehouse(String id);
 
     /**
      * 出入库

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

@@ -9,13 +9,25 @@ import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInOutInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutDetail;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
+import com.yh.saas.plugin.yiliangyiyun.mapper.WarehouseInOutInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutDetailService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.util.List;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 记录出入库信息 服务实现类
@@ -26,7 +38,6 @@ import java.util.List;
  */
 @Service
 public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInfoMapper, WarehouseInOutInfo> implements IWarehouseInOutInfoService {
-
     @Autowired
     private IWarehouseInOutDetailService warehouseInOutDetailService;
     @Autowired
@@ -36,6 +47,44 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     @Autowired
     private IWarehousePositionInfoService warehousePositionInfoService;
 
+    /**
+     * 待完成页面列表
+     *
+     * @param warehouseInOutInfo
+     * @return
+     */
+    @Override
+    public Page<WarehouseInOutInfo> selectWarehouseInOutInfo(WarehouseInOutInfo warehouseInOutInfo) {
+        Page<WarehouseInOutInfo> warehouseInOutInfoPage = this.selectPage(warehouseInOutInfo.getQueryPage(), new EntityWrapper<WarehouseInOutInfo>()
+                .eq("base_id", warehouseInOutInfo.getBaseId())
+                .eq("position_id", warehouseInOutInfo.getPositionId()));
+        return warehouseInOutInfoPage;
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     */
+    @Override
+    public void deleteWarehouse(String id) {
+        WarehouseInOutInfo warehouseInOutInfo = this.selectById(id);
+        if (warehouseInOutInfo != null) {
+            //记录
+            this.deleteById(warehouseInOutInfo.getId());
+            //化验信息
+            WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>().eq("info_id", id));
+            warehouseInOutDetailService.deleteById(warehouseInOutDetail.getId());
+
+        }
+    }
+
+
+    /**
+     * 出入库
+     * @param warehouseInOutInfo
+     * @return
+     */
     @Override
     public String InOutWarehouse(WarehouseInOutInfo warehouseInOutInfo) {
         WarehouseInOutDetail warehouseInOutDetail = warehouseInOutInfo.getWarehouseInOutDetail();