Merge branch 'dev_lzh_wms_20260120' into wms_dev

mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java

@@ -196,7 +196,8 @@ public class HandoverTaskOrderApplicationService {
         //pda上传图片插入出库管理
         stockOutOrderService.update(new LambdaUpdateWrapper<StockOutOrder>()
                 .eq(StockOutOrder::getOutOrderNumber,handoverTaskOrderDO.getOrderNumber())
-                    .set(StockOutOrder::getPictureApp,handoverTaskOrderDO.getPictureApp())
+                .set(StockOutOrder::getStatus,"9")//设置为出库
+                .set(StockOutOrder::getPictureApp,handoverTaskOrderDO.getPictureApp())//多张图片以，逗号隔开
         );
     }
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java

@@ -115,7 +115,7 @@ public class HandoverTaskOrderApi extends BaseController {
         return toAjax(handoverTaskOrderApplicationService.completeHandover(handoverTaskOrderDO));
     }
 
-    @ApiOperation("交接作业单APP上传图片")
+    @ApiOperation("交接作业单APP上传图片并出库")
     @PostMapping("/pictureApp")
     public AjaxResult pictureApp(@RequestBody HandoverTaskOrderDTO handoverTaskOrderDTO) {
         HandoverTaskOrderDO handoverTaskOrderDO = handoverTaskOrderAssembler.toDO(handoverTaskOrderDTO);

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

@@ -52,7 +52,7 @@ public class StockReceiptOrderAppApi extends BaseController {
     @ApiOperation("获取收货单")
     @GetMapping(value = "/getInfoByApp")
     public AjaxResult getInfoByApp(Long receiptOrderId) {
-        return AjaxResult.success(stockReceiptOrderApplicationService.getInfoByApp(receiptOrderId));
+        return AjaxResult.success(stockReceiptOrderApplicationService.getInfo(receiptOrderId));
     }
 
     /**