Merge remote-tracking branch 'origin/dev' into dev

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/receiptMaterialDetail/ReceiptMaterialDetailDTO.java

@@ -73,6 +73,30 @@ public class ReceiptMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "已收货数量")
     private BigDecimal alreadyReceiptQuantity;
 
+    @ApiModelProperty("累计已收货毛重(KG)，称重实绩")
+    private BigDecimal alreadyReceiptGrossWeight;
+
+    @ApiModelProperty("累计已收货净重(KG)")
+    private BigDecimal alreadyReceiptNetWeight;
+
+    @ApiModelProperty("本次称重毛重(KG)，仅提交请求使用，不落库")
+    private BigDecimal receiptGrossWeight;
+
+    @ApiModelProperty("本次净重(KG)，仅提交请求使用，不落库")
+    private BigDecimal receiptNetWeight;
+
+    @ApiModelProperty("累计已收货体积(CBM)")
+    private BigDecimal alreadyReceiptVolume;
+
+    @ApiModelProperty("累计已收货面积(SQM)")
+    private BigDecimal alreadyReceiptArea;
+
+    @ApiModelProperty("本次体积(CBM)，仅提交请求使用，不落库")
+    private BigDecimal receiptVolume;
+
+    @ApiModelProperty("本次面积(SQM)，仅提交请求使用，不落库")
+    private BigDecimal receiptArea;
+
     @ApiModelProperty("收货数量")
     @Excel(name = "收货数量")
     private BigDecimal receiptQuantity;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java

@@ -1,6 +1,6 @@
 package com.mhd.wms.interfaces.facadeApp.stockReceiptOrder;
 
-import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfoApi;
@@ -11,6 +11,7 @@ import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
 import com.mhd.wms.interfaces.assember.stockReceiptOrder.StockReceiptOrderAssembler;
 import com.mhd.wms.interfaces.dto.stockReceiptOrder.StockReceiptOrderDTO;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,6 +33,9 @@ public class StockReceiptOrderAppApi extends BaseController {
     @Resource
     private StockReceiptOrderAssembler stockReceiptOrderAssembler;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     /**
      * 分页查询收货单列表
      */
@@ -51,8 +55,10 @@ public class StockReceiptOrderAppApi extends BaseController {
      */
     @ApiOperation("获取收货单详细信息")
     @GetMapping(value = "/getInfoByApp")
-    public AjaxResult getInfoByApp(@RequestParam Long receiptOrderId,
-                                   @RequestParam(required = false) Integer receiptStatus) {
+    public AjaxResult getInfoByApp(
+            @ApiParam(value = "收货单ID", required = true) @RequestParam Long receiptOrderId,
+            @ApiParam(value = "明细筛选：1=待收货（仅状态1待收货、2收货中）；3=已收货（仅3已收货、4少收、5超收）")
+            @RequestParam(required = false) Integer receiptStatus) {
         return AjaxResult.success(stockReceiptOrderApplicationService.getInfoByApp(receiptOrderId, receiptStatus));
     }
 
@@ -62,7 +68,8 @@ public class StockReceiptOrderAppApi extends BaseController {
     @ApiOperation("收货")
     @PostMapping("/receivingGoods")
     public AjaxResult receivingGoods(@RequestBody StockReceiptOrderDTO stockReceiptOrderDTO) {
-        StockReceiptOrderDO stockReceiptOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDTO), StockReceiptOrderDO.class);
+        // 勿用 Hutool JSON 往返转 DO：嵌套 children、receiptGrossWeight/receiptNetWeight/receiptVolume/receiptArea 等会丢失或类型不对，导致累计未落库
+        StockReceiptOrderDO stockReceiptOrderDO = objectMapper.convertValue(stockReceiptOrderDTO, StockReceiptOrderDO.class);
         return toAjax(stockReceiptOrderApplicationService.receivingGoodsByApp(stockReceiptOrderDO));
     }
 
@@ -87,7 +94,7 @@ public class StockReceiptOrderAppApi extends BaseController {
     @ApiOperation("无单收货")
     @PostMapping("/noOrderReceipt")
     public AjaxResult noOrderReceipt(@RequestBody StockReceiptOrderDTO stockReceiptOrderDTO) {
-        StockReceiptOrderDO stockReceiptOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDTO), StockReceiptOrderDO.class);
+        StockReceiptOrderDO stockReceiptOrderDO = objectMapper.convertValue(stockReceiptOrderDTO, StockReceiptOrderDO.class);
         return toAjax(stockReceiptOrderApplicationService.noOrderReceipt(stockReceiptOrderDO));
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockShelfOrder/StockShelfOrderAppApi.java

@@ -51,9 +51,11 @@ public class StockShelfOrderAppApi extends BaseController {
      */
     @ApiOperation("获取上架单")
     @GetMapping(value = "/getInfo")
-    public AjaxResult getInfo(Long shelfOrderId)
+    public AjaxResult getInfo(Long shelfOrderId,
+                               @RequestParam(required = false) Integer shelfStatus)
     {
-        return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId, true));
+        // 仅 PDA 支持根据明细 shelvesStatus 做筛选：1 待上架(仅1/2)，3 已上架(3/4/5)
+        return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId, true, shelfStatus));
     }