删除

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

@@ -34,7 +34,7 @@ public class InOutWarehouseTaskController {
      * @param inOutWarehouseTask
      * @return
      */
-    @PostMapping("/insertOrUpdateInOutTask")
+    @PostMapping("/api/insertOrUpdateInOutTask")
     public String insertOrUpdateInOutTask(@RequestBody InOutWarehouseTask inOutWarehouseTask) {
         return inOutWarehouseTaskService.insertOrUpdateInOutTask(inOutWarehouseTask);
     }
@@ -69,5 +69,24 @@ public class InOutWarehouseTaskController {
     public List<InOutWarehouseTask> getInOutWarehouseTask(String relevanceId){
         return inOutWarehouseTaskService.getInOutWarehouseTask(relevanceId);
     }
+
+    /**
+     * 删除出入库任务
+     * @param inOutWarehouseTask
+     */
+    @PostMapping("/api/deleteInOutWarehouseTask")
+    public void deleteInOutWarehouseTask(@RequestBody InOutWarehouseTask inOutWarehouseTask){
+        inOutWarehouseTaskService.deleteInOutWarehouseTask(inOutWarehouseTask.getId(),inOutWarehouseTask.getRelevanceId());
+    }
+
+    /**
+     * 更改状态
+     * @param inOutWarehouseTask
+     * @return
+     */
+    @PostMapping("/api/editStatus")
+    public String editStatus(@RequestBody InOutWarehouseTask inOutWarehouseTask){
+        return inOutWarehouseTaskService.editStatus(inOutWarehouseTask.getId());
+    }
 }
 

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

@@ -223,7 +223,7 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
 
         public static final String relevanceId = "relevance_id";
 
-        public static final String id = "id";
+
     }
 
 }

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

@@ -45,4 +45,17 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
      * @return
      */
     List<InOutWarehouseTask> getInOutWarehouseTask(String relevanceId);
+
+    /**
+     * 删除出入库任务
+     * @param id
+     */
+    void deleteInOutWarehouseTask(String id, String relevanceId);
+
+    /**
+     * 更改状态
+     * @param id
+     * @return
+     */
+    String editStatus(String id);
 }

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

@@ -4,6 +4,7 @@ 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.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.baomidou.mybatisplus.plugins.Page;
@@ -12,6 +13,7 @@ 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 org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,13 +32,15 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
 
     @Autowired
     private IInOutWarehouseTaskService inOutWarehouseTaskService;
+    @Autowired
+    private ICommonBillOperateHisService billOperateHisService;
+
     /**
      * 出入库任务新增 编辑
      * @param inOutWarehouseTask
      * @return
      */
     @Override
-
     public String insertOrUpdateInOutTask(InOutWarehouseTask inOutWarehouseTask) {
         // 根据传参id判断是否是新增
         //  空是新增
@@ -46,6 +50,10 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_REVIEWED.getFlag());
             inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_REVIEWED.getName());
             inOutWarehouseTask.setEstablishDate(new Date());
+            //出库任务，入库任务，赋值关联id
+            if ("1".equals(inOutWarehouseTask.getTaskTypeKey()) || "2".equals(inOutWarehouseTask.getTaskTypeKey())){
+                inOutWarehouseTask.setRelevanceId(inOutWarehouseTask.getId());
+            }
             // 操作主表数据
             this.insert(inOutWarehouseTask);
         }
@@ -102,6 +110,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         page.setSize(inOutWarehouseTask.getPageSize());
         return page;
     }
+
     /**
      * 查看出入库任务
      * @param relevanceId
@@ -114,4 +123,61 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         return inOutWarehouseTaskList;
     }
 
+    /**
+     * 删除出入库任务
+     * @param id
+     */
+    @Override
+    public void deleteInOutWarehouseTask(String id ,String relevanceId){
+        //查询出入库任务
+        InOutWarehouseTask inOutWarehouseTask = this.selectById(id);
+        if (inOutWarehouseTask != null) {
+            //出库任务，入库任务,移库先删入库
+            if ("1".equals(inOutWarehouseTask.getTaskTypeKey()) || "2".equals(inOutWarehouseTask.getTaskTypeKey()) ||
+                    ("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "2".equals(inOutWarehouseTask.getInOutFlag())) ) {
+                inOutWarehouseTaskService.deleteById(inOutWarehouseTask.getId());
+            }
+            //移库先删出库，退库并出库
+            else if (("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "1".equals(inOutWarehouseTask.getInOutFlag())) || "4".equals(inOutWarehouseTask.getTaskTypeKey())) {
+                List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+                        .eq(InOutWarehouseTask.QueryFiles.relevanceId, relevanceId).eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                if (!CollectionUtils.isEmpty(inOutWarehouseTaskList)) {
+                    for (InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskList) {
+                        inOutWarehouseTaskService.deleteById(inOutWarehouseTask1.getId());
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 更改状态
+     * @param id
+     * @return
+     */
+    @Override
+    public String editStatus(String id){
+        //查询出入库任务
+        InOutWarehouseTask inOutWarehouseTask = this.selectById(id);
+        //更改状态
+        if (inOutWarehouseTask != null ){
+            if (StatusEnum.TASK_DO.getFlag().equals(inOutWarehouseTask.getTaskStatusKey())) {
+                inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_COMPLETED.getFlag());
+                inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_COMPLETED.getName());
+            } else {
+                inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_DO.getFlag());
+                inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_DO.getName());
+            }
+            //更改运输任务信息
+            this.updateById(inOutWarehouseTask);
+            // 插入操作历史
+            String staffName = this.billOperateHisService.getStaffAndName();
+            // 插入操作历史
+            this.billOperateHisService.saveBillOperateHis(inOutWarehouseTask.getId(), NumberConstant.CONSTANT_TRAN, staffName, null,
+                    inOutWarehouseTask.getTaskStatus(), null, "");
+            return "OK";
+        }
+        return "NG";
+    }
+
 }

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

@@ -43,7 +43,9 @@
         publisher as publisher,
         task_status as taskStatus,
         establish_date as establishDate,
-        relevance_id as relevanceId
+        relevance_id as relevanceId,
+        task_type_key as taskTypeKey,
+        in_out_flag as inOutFlag
         FROM in_out_warehouse_task
         WHERE
         comp_id = #{compId}