出入库任务新增编辑

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

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -16,6 +18,29 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/inOutWarehouseTask")
 public class InOutWarehouseTaskController {
+    @Autowired
+    private IInOutWarehouseTaskService inOutWarehouseTaskService;
+    /**
+     * 出入库任务新增 编辑
+     *
+     * @param inOutWarehouseTask
+     * @return
+     */
+    @PostMapping("/insertOrUpdateInOutTask")
+    public String insertOrUpdateInOutTask(@RequestBody InOutWarehouseTask inOutWarehouseTask) {
+        return inOutWarehouseTaskService.insertOrUpdateInOutTask(inOutWarehouseTask);
+    }
+
+    /**
+     * 判断移库编号
+     *
+     * @param moveTaskNo
+     * @return
+     */
+    @GetMapping("/selectTaskNo")
+    public boolean selectTaskNo(String moveTaskNo) {
+        return inOutWarehouseTaskService.selectTaskNo(moveTaskNo);
+    }
 
 }
 

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

@@ -187,4 +187,16 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
         return this.id;
     }
 
+    public static class QueryFiles {
+
+        public  static final String COMP_ID = "comp_id";
+
+        public static final String MOVE_TASK_NO = "move_task_no";
+
+        public static final String DELETE_FLAG = "delete_flag";
+
+
+
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 
 /**
  * <p>
@@ -12,5 +13,20 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2021-06-22
  */
 public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask> {
+    /**
+     * 出入库任务新增 编辑
+     *
+     * @param inOutWarehouseTask
+     * @return
+     */
+    String insertOrUpdateInOutTask(InOutWarehouseTask inOutWarehouseTask);
+
+    /**
+     * 判断移库编号
+     *
+     * @param moveTaskNo
+     * @return
+     */
+    boolean selectTaskNo(String moveTaskNo);
 
 }

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

@@ -1,9 +1,16 @@
 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.common.support.util.StringUtils;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +23,50 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTaskMapper, InOutWarehouseTask> implements IInOutWarehouseTaskService {
+    /**
+     * 出入库任务新增 编辑
+     *
+     * @param inOutWarehouseTask
+     * @return
+     */
+    @Override
+    public String insertOrUpdateInOutTask(InOutWarehouseTask inOutWarehouseTask) {
+        // 根据传参id判断是否是新增
+        //  空是新增
+        if (StringUtils.isEmpty(inOutWarehouseTask.getId())) {
+
+            // 主键id
+            inOutWarehouseTask.setId(IdGenerator.generateUUID());
+            inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_REVIEWED.getFlag());
+            inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_REVIEWED.getName());
+            // 操作主表数据
+            this.insert(inOutWarehouseTask);
+        }
+        //  有id是修改
+        else {
+            // 操作主表数据
+            this.updateById(inOutWarehouseTask);
+        }
+        return inOutWarehouseTask.getId();
+    }
+
+    /**
+     * 判断移库编号
+     *
+     * @param moveTaskNo
+     * @return
+     */
+    @Override
+    public boolean selectTaskNo(String moveTaskNo) {
+        // 根据出入出入库编号查询数据
+        InOutWarehouseTask inOutWarehouseTask= this.selectOne(new EntityWrapper<InOutWarehouseTask>().eq(InOutWarehouseTask.QueryFiles.MOVE_TASK_NO, moveTaskNo)
+                .eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        //如果没有可以使用
+        if (inOutWarehouseTask == null) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
 }

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

@@ -54,10 +54,10 @@
         and w.delete_flag = '0'
         and w.status_flag = '3'
         <if test="searchType != null and searchType != ''">
-            <if test="searchType == 1">
+            <if test="searchType == 2">
                 AND w.in_out_flag = '1'
             </if>
-            <if test="searchType == 2">
+            <if test="searchType == 3">
                 AND w.in_out_flag = '2'
             </if>
         </if>
@@ -117,10 +117,10 @@
         and w.delete_flag = '0'
         and w.status_flag = '3'
         <if test="searchType != null and searchType != ''">
-            <if test="searchType == 1">
+            <if test="searchType == 2">
                 AND w.in_out_flag = '1'
             </if>
-            <if test="searchType == 2">
+            <if test="searchType == 3">
                 AND w.in_out_flag = '2'
             </if>
         </if>