diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 56cb844c7..774aa4995 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -78,6 +78,7 @@ import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -569,17 +570,26 @@ public class StockInOrderApplicationService { return b; } - public Boolean updateQuantity( BigDecimal quantity, Long materialDetailId){ + public Boolean updateQuantity( BigDecimal quantity, Long materialDetailId,BigDecimal area, + BigDecimal volume,BigDecimal weight){ Boolean result = false; InMaterialDetail inMaterialDetail = inMaterialDetailService.getById(materialDetailId); if (inMaterialDetail != null) { inMaterialDetail.setQuantity(quantity); + inMaterialDetail.setTotalArea(area); + inMaterialDetail.setTotalVolume(volume); + inMaterialDetail.setTotalNetWeight(weight); + inMaterialDetail.setTotalGrossWeight(weight); boolean b = inMaterialDetailService.updateById(inMaterialDetail); Long uniqueId = inMaterialDetail.getUniqueId(); ReceiptMaterialDetail one = receiptMaterialDetailService.getOne(new LambdaQueryWrapper() .eq(ReceiptMaterialDetail::getInUniqueId, uniqueId) .eq(ReceiptMaterialDetail::getDelFlag, 1)); one.setQuantity(quantity); + one.setTotalArea(area); + one.setTotalVolume(volume); + one.setTotalNetWeight(weight); + one.setTotalGrossWeight(weight); boolean b1 = receiptMaterialDetailService.updateById(one); result = b && b1; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 706ae5b4f..988275c98 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -221,8 +221,12 @@ public class StockInOrderApi extends BaseController { @ApiOperation("pda简易模式修改计划数量") @GetMapping(value = "/updateQuantity") - public AjaxResult updateQuantity(@RequestParam BigDecimal quantity, @RequestParam Long materialDetailId) { - return AjaxResult.success(stockInOrderApplicationService.updateQuantity(quantity, materialDetailId)); + public AjaxResult updateQuantity(@RequestParam BigDecimal quantity, + @RequestParam Long materialDetailId, + @RequestParam BigDecimal area, + @RequestParam BigDecimal volume + ,@RequestParam BigDecimal weight) { + return AjaxResult.success(stockInOrderApplicationService.updateQuantity(quantity, materialDetailId, area, volume, weight)); } /**