新增加工产品出库，修改加工产品数据存储逻辑

guoshilong

2022-09-17 680b380e3d9189f2bfd79fb33a6428d82219e4bc

 src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java

@@ -64,7 +64,7 @@
    */
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入sale")
   @ApiOperation(value = "详情", notes = "传入inventory")
   public R<Inventory> detail(Inventory inventory) {
      Inventory detail = inventoryService.getOne(Condition.getQueryWrapper(inventory));
      return R.data(detail);
@@ -75,7 +75,7 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入sale")
   @ApiOperation(value = "分页", notes = "传入inventory")
   public R<IPage<Inventory>> list(Inventory inventory, Query query) {
      IPage<Inventory> pages = inventoryService.page(Condition.getPage(query), Condition.getQueryWrapper(inventory));
      return R.data(pages);
@@ -86,7 +86,7 @@
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入sale")
   @ApiOperation(value = "分页", notes = "传入inventory")
   public R<IPage<InventoryVO>> page(InventoryVO inventory, Query query) {
      IPage<InventoryVO> pages = inventoryService.selectSalePage(Condition.getPage(query), inventory);
      return R.data(pages);
@@ -97,7 +97,7 @@
    */
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入sale")
   @ApiOperation(value = "新增", notes = "传入inventory")
   public R save(@Valid @RequestBody Inventory inventory) {
      return R.status(inventoryService.save(inventory));
   }
@@ -107,7 +107,7 @@
    */
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入sale")
   @ApiOperation(value = "修改", notes = "传入inventory")
   public R update(@Valid @RequestBody Inventory inventory) {
      return R.status(inventoryService.updateById(inventory));
   }
@@ -117,7 +117,7 @@
    */
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入sale")
   @ApiOperation(value = "新增或修改", notes = "传入inventory")
   public R submit(@Valid @RequestBody InventoryVO inventory) {
      boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getProid());
      if (!res){
@@ -126,6 +126,7 @@
         //库存充足，减去相应库存
         farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
      }
      inventory.setProdId(inventory.getProid());
      return R.status(inventoryService.saveOrUpdate(inventory));
   }

@@ -134,7 +135,7 @@
    */
   @PostMapping("/submitProcess")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "新增或修改", notes = "传入sale")
   @ApiOperation(value = "新增或修改", notes = "传入inventory")
   public R submitProcess(@Valid @RequestBody InventoryVO inventory) {
//      boolean res = processService.stockCompare(inventory.getSaleNum(),inventory.getProid());
//      if (!res){
@@ -159,6 +160,7 @@
         inventory.setLandId(processInvVO.getLandId());
         processInvService.updateById(processInv);
      }
      inventory.setProdId(inventory.getProid());
      return R.status(inventoryService.saveOrUpdate(inventory));
   }

@@ -170,10 +172,17 @@
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      Inventory inventory = inventoryService.getById(Long.parseLong(ids));
      FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(inventory.getStrainId(), inventory.getLandId());
      Double weight = Double.parseDouble(farmProductStock.getWeight())+inventory.getSaleNum();
      farmProductStock.setWeight(weight.toString());
      farmProductStockService.updateById(farmProductStock);
      if (inventory.getType() == 0){
         FarmProductStock farmProductStock = farmProductStockService.getById(inventory.getProdId());
         Double weight = Double.parseDouble(farmProductStock.getWeight())+inventory.getSaleNum();
         farmProductStock.setWeight(weight.toString());
         farmProductStockService.updateById(farmProductStock);
      }else {
         ProcessInv inv = processInvService.findById(inventory.getProdId());
         Double weight = inv.getProductInventoryNum()+inventory.getSaleNum();
         inv.setProductInventoryNum(weight);
         processInvService.updateById(inv);
      }
      return R.status(inventoryService.deleteLogic(Func.toLongList(ids)));
   }