修改消息返回成功结果

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/InventoryExceptionEnum.java

@@ -10,6 +10,7 @@ public enum InventoryExceptionEnum implements IExceptionEnum {
     INVENTORY_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"填写的报废的装备数量大于实际能进行报废的数量"),
     BROKENNUM_BEYOND_STOCK(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"审核中的数量已存在最大可报废数量，现提交失败"),
     ORDER_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"盘点单据不存在"),
+    ORDER_HAS_START(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已经开始，请勿重复操作"),
     ;
     /**
      * 错误编码

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

@@ -23,20 +23,21 @@ import javax.annotation.Resource;
 @RestController
 @Slf4j
 @RequestMapping("/SoftUpdate")
+
 @Api(tags = "软件应用管理模块")
 public class ApplicationController {
 
     @Resource
     private ApplicationService applicationService;
     //获取应用信息的分页
-    @PostMapping("/GetAllUpdateCfg")
+    @PostMapping(path="/GetAllUpdateCfg",name="获取应用信息的分页")
     @ApiOperation("获取应用信息的分页")
     public ApiRes<PageResult<Application>> GetAllUpdateCfg(@RequestBody ApplicationReq req){
         return ApiRes.success(applicationService.GetAllUpdateCfg(req));
     }
 
     //新增或者修改应用信息
-    @PostMapping("/AddOrUpdateCfg")
+    @PostMapping(path="/AddOrUpdateCfg",name="新增应用信息")
     @ApiOperation("新增应用信息")
     public ApiRes<String> AddOrUpdateCfg(@RequestBody @Validated(ValidationApi.add.class) ApplicationReq req){
         return ApiRes.success(applicationService.AddOrUpdateCfg(req));

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

@@ -33,7 +33,7 @@ public class BussinessController {
 
 
     //创建业务单
-    @PostMapping("/AddBussinessOrder")
+    @PostMapping(path="/AddBussinessOrder",name="创建业务单")
     @ApiOperation("创建业务单")
     public ApiRes<String> AddBussinessOrder(@RequestBody @Validated(ValidationApi.add.class) UpdateBusFormReq req){
 
@@ -42,13 +42,13 @@ public class BussinessController {
 
 
     //查看业务单（可以条件查询）
-    @PostMapping("/showBussinessOrder")
+    @PostMapping(path="/showBussinessOrder",name="查看业务单")
     @ApiOperation("查看业务单")
     public ApiRes<PageResult<BusForm>> showBussinessOrder(@RequestBody QueryBusFormReq req){
         return ApiRes.success(busFormService.showBussinessOrder(req));
     }
     //根据业务单id查询出入库单据
-    @PostMapping("/showOrderByBusOrderId")
+    @PostMapping(path="/showOrderByBusOrderId",name="根据业务单id查询出入库单据")
     @ApiOperation("根据业务单id查询出入库单据")
     public ApiRes<Object> showOrderByBusOrderId(@RequestBody QueryBusFormReq req){
         return ApiRes.success(busFormService.showOrderByBusOrderId(req));

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

@@ -32,7 +32,7 @@ public class BussinessInventoryController {
     private BussinessInventoryService BussinessInventoryService;
 
     //盘库申请
-    @PostMapping("/AddStocktake")
+    @PostMapping(path="/AddStocktake",name="盘库申请")
     @ApiOperation("盘库申请")
     public ApiRes<String> AddStocktake (@RequestBody @Validated(ValidationApi.add.class) UpdateInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
@@ -48,7 +48,8 @@ public class BussinessInventoryController {
     }
 
     //盘库申请
-    @PostMapping("/Check")
+
+    @PostMapping(path="/Check",name="预览盘点单")
     @ApiOperation("预览盘点单")
     public ApiRes<BussinessInventoryDto> Check (@RequestBody @Validated(ValidationApi.detail.class) BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
@@ -56,35 +57,35 @@ public class BussinessInventoryController {
         return ApiRes.success(BussinessInventoryService.Check(req));
     }
     //开始盘点，已废弃
-    @PostMapping("/Start")
+    @PostMapping(path="/Start",name="开始盘点")
     @ApiOperation("开始盘点")
-    public ApiRes<Boolean> Start (@RequestBody  BussinessInventoryReq req){
+    public ApiRes<Boolean> Start (@RequestBody  UploadInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.Start(req));
     }
     //查询列表
-    @PostMapping("/GetPage")
+    @PostMapping(path="/GetPage",name="查询列表")
     @ApiOperation("查询列表")
     public ApiRes<PageResult<BussinessInventory>> GetPage (@RequestBody  BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.GetPage(req));
     }
     //盘库申请
-    @PostMapping("/GetById")
+    @PostMapping(path="/GetById",name="查询详情")
     @ApiOperation("查询详情")
     public ApiRes<BussinessInventoryDto> GetById (@RequestBody  BussinessInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.GetDetailById(req));
     }
     //盘库申请
-    @PostMapping("/UploadStock")
+    @PostMapping(path="/UploadStock",name="上传盘点记录")
     @ApiOperation("上传盘点记录")
     public ApiRes<Boolean> UploadStock (@RequestBody UploadInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.UploadStock(req));
     }
     //盘库申请
-    @PostMapping("/UseOrFinished")
+    @PostMapping(path="/UseOrFinished",name="确认结果/结束盘点")
     @ApiOperation("确认结果/结束盘点")
     public ApiRes<Boolean> UseOrFinished (@RequestBody UploadInventoryReq req){
         //判断是否有工作流id，如果有则将状态进行修改

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

@@ -24,14 +24,14 @@ public class CabinetBoxController {
     @Resource
     private CabinetBoxService cabinetBoxService;
     //添加箱门信息
-    @PostMapping("/AddBoxInfo")
+    @PostMapping(path="/AddBoxInfo",name="添加箱门信息")
     @ApiOperation("添加箱门信息")
     public ApiRes<String> AddOrUpdateBoxInfo(@RequestBody  UpdateCabinetReq req){
         return ApiRes.success(cabinetBoxService.AddOrUpdateBoxInfo(req));
     }
 
     //添加箱门信息
-    @PostMapping("/DeleteBox")
+    @PostMapping(path="/DeleteBox",name="添加箱门信息")
     @ApiOperation("删除箱门")
     public ApiRes<String> DeleteBox(@RequestBody @Validated(ValidationApi.delete.class) UpdateCabinetReq req){
         return ApiRes.success(cabinetBoxService.DeleteBox(req));

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

@@ -35,14 +35,14 @@ public class CabinetController {
     private CabinetBoxService cabinetBoxService;
 
 
-    @PostMapping("/AddCabinetInfo")
+    @PostMapping(path="/AddCabinetInfo",name="添加单警柜信息")
     @ApiOperation("添加单警柜信息")
     public ApiRes<String> addCabinetInfo(@RequestBody @Validated(ValidationApi.add.class) UpdateCabinetReq req){
         String cabinetId = cabinetService.addCabinetInfo(req);
         return ApiRes.success(cabinetId);
     }
 
-    @PostMapping("/ErrorState")
+    @PostMapping(path="/ErrorState",name="单警柜状态变更")
     @ApiOperation("单警柜状态变更")
     public ApiRes<Boolean> ChangeCabinetState(@RequestBody UpdateCabinetReq req) {
         boolean result = cabinetService.ChangeCabinetState(req);
@@ -53,13 +53,13 @@ public class CabinetController {
     }
 
 
-    @PostMapping("/DeleteCabinetInfo")
+    @PostMapping(path="/DeleteCabinetInfo",name="删除单警柜信息")
     @ApiOperation("删除单警柜信息")
     public ApiRes<Boolean> deleteCabinetInfo(@RequestBody @Validated(ValidationApi.delete.class) UpdateCabinetReq req) {
         return ApiRes.success(cabinetService.deleteCabinetInfo(req));
     }
 
-    @PostMapping("/UpdateCabinetServer")
+    @PostMapping(path="/UpdateCabinetServer",name="修改单警柜信息,平台使用")
     @ApiOperation("修改单警柜信息,平台使用")
     public ApiRes<Boolean> UpdateCabinetServer(@RequestBody  UpdateCabinetReq req) {
         boolean result = cabinetService.updateCabinetInfo(req);
@@ -69,7 +69,8 @@ public class CabinetController {
         return ApiRes.success(result);
     }
 
-    @PostMapping("/UpdateCabinetClient")
+
+    @PostMapping(path="/UpdateCabinetClient",name="修改单警柜信息,警柜使用")
     @ApiOperation("修改单警柜信息,警柜使用")
     public ApiRes<Boolean> UpdateCabinetClient(@RequestBody  UpdateCabinetReq req) {
         boolean result = cabinetService.updateCabinetInfo(req);
@@ -80,7 +81,7 @@ public class CabinetController {
     }
 
     //通过单警柜id查询单个箱门及其箱门信息
-    @PostMapping("/ShowOneCabinet")
+    @PostMapping(path="/ShowOneCabinet",name="查询单个单警柜及其箱门信息")
     @ApiOperation("查询单个单警柜及其箱门信息")
     public ApiRes<CabinetDto> showOneCabinet(@RequestBody @Validated(ValidationApi.detail.class) CabinetReq req){
         return ApiRes.success(cabinetService.showOneCabinet(req));
@@ -88,7 +89,7 @@ public class CabinetController {
 
 
     //根据组织机构id查询出单警柜的详细信息(list)
-    @PostMapping("/ShowCabinetList")
+    @PostMapping(path="/ShowCabinetList",name="查询单警柜列表")
     @ApiOperation("查询单警柜列表")
     public ApiRes<List<CabinetDto>> showCabinetList(@RequestBody CabinetReq req){
         List<CabinetDto> allCabinetList = cabinetService.getAllCabinetList(req);
@@ -96,7 +97,7 @@ public class CabinetController {
     }
 
     //根据组织机构id查询出单警柜的详细信息(page)
-    @PostMapping("/ShowCabinetPage")
+    @PostMapping(path="/ShowCabinetPage",name="查询单警柜列表")
     @ApiOperation("查询单警柜列表")
     public ApiRes<PageResult<CabinetDto>> ShowCabinetPage(@RequestBody CabinetReq req){
         return ApiRes.success(cabinetService.ShowCabinetPage(req));
@@ -114,7 +115,7 @@ public class CabinetController {
 //        return ApiRes.success(result);
 //    }
 
-    @PostMapping("/SearchOrgId")
+    @PostMapping(path="/SearchOrgId",name="根据单警柜id查询组织机构id")
     @ApiOperation("/根据单警柜id查询组织机构id")
     public ApiRes<Long> SearchOrgId(@RequestBody @Validated(ValidationApi.detail.class) CabinetReq req){
         return ApiRes.success(cabinetService.SearchOrgId(req));

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

@@ -29,34 +29,34 @@ public class DestoryUnitController {
     private DestoryUnitService destoryUnitService;
 
     //创建报废/销毁单位
-    @PostMapping("/AddDestoryUnit")
+    @PostMapping(path="/AddDestoryUnit",name="创建报废/销毁单位")
     @ApiOperation("创建报废/销毁单位")
     public ApiRes<String> addDestoryUnit(@RequestBody @Validated(ValidationApi.add.class) DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.addDestoryUnit(req));
     }
 
     //修改报废/销毁单位
-    @PostMapping("/UpdateDestoryUnit")
+    @PostMapping(path="/UpdateDestoryUnit",name="修改报废/销毁单位")
     @ApiOperation("修改报废/销毁单位")
     public ApiRes<Boolean> updateDestoryUnit(@RequestBody @Validated(ValidationApi.edit.class) DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.updateDestoryUnit(req));
     }
 
     //查询报废/销毁单位(list)
-    @PostMapping("/ShowDestoryUnitList")
+    @PostMapping(path="/ShowDestoryUnitList",name="查询报废/销毁单位(list)")
     @ApiOperation("查询报废/销毁单位(list)")
     public ApiRes<List<DestoryUnit>> showDestoryUnitList(@RequestBody DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.showDestoryUnitList(req));
     }
 
     //查询报废/销毁单位(page)
-    @PostMapping("/ShowDestoryUnitPage")
+    @PostMapping(path="/ShowDestoryUnitPage",name="修改报废/销毁单位(page)")
     @ApiOperation("修改报废/销毁单位(page)")
     public ApiRes<PageResult<DestoryUnit>> showDestoryUnitPage(@RequestBody DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.showDestoryUnitPage(req));
     }
     //删除报废/销毁单位
-    @PostMapping("/DelDestoryUnit")
+    @PostMapping(path="/DelDestoryUnit",name="修改报废/销毁单位")
     @ApiOperation("修改报废/销毁单位")
     public ApiRes<Boolean> delDestoryUnit(@RequestBody DestoryUnitReq req){
         return ApiRes.success(destoryUnitService.delDestoryUnit(req));

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

@@ -24,7 +24,7 @@ public interface BussinessInventoryService extends IService<BussinessInventory>
 
     BussinessInventoryDto Check(BussinessInventoryReq req);
 
-    Boolean Start(BussinessInventoryReq req);
+    Boolean Start(UploadInventoryReq req);
 
     PageResult<BussinessInventory> GetPage(BussinessInventoryReq req);
 

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

@@ -274,9 +274,23 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     //开始盘点
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Boolean Start(BussinessInventoryReq req) {
+    public Boolean Start(UploadInventoryReq req) {
         String orderId=req.getOrderId();
         BussinessInventory bi= this.getById(orderId);
+        if (bi.getInventoryState().equals("running"))
+        {
+            throw new ServiceException(InventoryExceptionEnum.ORDER_HAS_START);
+        }
+        List<BussinessDetail> BDList=new ArrayList<>();
+        for (EquipmentListDto bd:
+        req.getEquipmentList()) {
+            BussinessDetail bdInsert=new BussinessDetail();
+            bdInsert.setInventoryId(Long.valueOf(req.getOrderId()));
+            BeanPlusUtil.copyProperties(bd,bdInsert);
+            bdInsert.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+            BDList.add(bdInsert);
+        }
+        bussinessInventoryDetailService.saveBatch(BDList);
 
         if (bi!=null)
         {