添加盘点删除接口

jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java

@@ -47,7 +47,12 @@ public class BussinessInventoryController {
         }
         return ApiRes.success(BussinessInventoryService.AddInvOrder(req));
     }
-
+    @PostMapping(path="/DeleteStocktake",name="删除盘库#logType=30")
+    @ApiOperation("删除盘库")
+    public ApiRes<String> DeleteStocktake (@RequestBody @Validated(ValidationApi.add.class) UpdateInventoryReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        return ApiRes.success(BussinessInventoryService.DeleteOrder(req));
+    }
     //盘库申请
 
     @PostMapping(path="/Check",name="预览盘点单#enable")

jyzb-biz/src/main/java/com/junmp/jyzb/service/BussinessInventoryService.java

@@ -21,7 +21,7 @@ public interface BussinessInventoryService extends IService<BussinessInventory>
 
     String AddInvOrder(UpdateInventoryReq req);
 
-
+    String DeleteOrder(UpdateInventoryReq req);
     BussinessInventoryDto Check(BussinessInventoryReq req);
 
     Boolean Start(UploadInventoryReq req);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -204,6 +204,27 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
 
     }
 
+
+    @Transactional(rollbackFor = Exception.class)
+    public String DeleteOrder(UpdateInventoryReq req) {
+        if (StringUtils.isNotBlank(req.getId()))
+        {
+            BussinessInventory BI=this.getById(req.getId());
+            if (BI.getInventoryState().equals("waitting")&&BI.getExamineState().equals("none"))
+            {
+                this.removeById(BI);
+            }
+            else
+            {
+                throw new ServiceException(InventoryExceptionEnum.RUNNINGORDER_EXIST);
+            }
+
+            return req.getId();
+
+    }
+        return req.getId();
+    }
+
     @Override
     public BussinessInventoryDto Check(BussinessInventoryReq req) {
         String Id=req.getOrderId();
@@ -629,7 +650,8 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
             }
         }
         wrapper.eq(StringUtils.isNotBlank(req.getInventoryType()), BussinessInventory::getInventoryType, req.getInventoryType());
-        wrapper.orderByDesc(BussinessInventory::getApplyTime);
+        wrapper.orderByDesc(BussinessInventory::getUpdateTime);
+
         return wrapper;
     }