1.5.4

WMS:修改获取审核通过的退库记录列表接口

hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java

@@ -191,12 +191,13 @@ public class WmsMobileController extends BaseController {
      * 查询原材料审核通过的退库记录明细列表
      */
 //    @RequiresPermissions("wms:rawoutstock:list")
-    @PostMapping("/getAuditPassRawReturnDetails")
+    @GetMapping("/getAuditPassRawReturns")
-    public TableDataInfo getAuditPassRawReturnDetails(WmsRawReturnDetail wmsRawReturnDetail) {
+    public TableDataInfo getAuditPassRawReturns(WmsRawReturnDetail wmsRawReturnDetail) {
         startPage();
-//        WmsRawReturnDetail wmsRawReturnDetail = new WmsRawReturnDetail();
+
-//        wmsRawReturnDetail.setApplyBy(request.getParameter("applyBy"));
+        WmsRawReturn wmsRawReturn = new WmsRawReturn();
-        List<WmsRawReturnDetail> list = wmsRawReturnService.selectAuditPassRawReturnDetails(wmsRawReturnDetail);
+        wmsRawReturn.setAuditStatus(WmsConstants.WMS_AUDIT_STATUS_PASS);
+        List<WmsRawReturn> list = wmsRawReturnService.selectWmsRawReturnJoinList(wmsRawReturn);
         return getDataTable(list);
     }
 

hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawReturnServiceImpl.java

@@ -96,6 +96,7 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
      */
     @Override
     public WmsRawReturn selectWmsRawReturnByRawReturnId4Confirm(Long rawReturnId) {
+        //获取退库记录with退库记录明细列表
         WmsRawReturn rawReturn = wmsRawReturnMapper.selectWmsRawReturnByRawReturnId(rawReturnId);
         Long materialId = rawReturn.getMaterialId() == null ? 0L : rawReturn.getMaterialId();
         Long productId = rawReturn.getProductId() == null ? 0L : rawReturn.getProductId();
@@ -412,7 +413,7 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int applyRawReturn(WmsRawReturn wmsRawReturn) {
-        //申请退库不指定库位，申请退库的多个物料生成多条退库
+        //申请退库不指定库位，申请退库的多个物料生成多条退库记录
         List<WmsRawReturnDetail> rawReturnDetails = wmsRawReturn.getWmsRawReturnDetailList();
         //根据物料ID分组获取总申请数量
         Map<Long, BigDecimal> rawReturnDetailMap = rawReturnDetails.stream()