weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_lzh_wms_20260120' into wms_dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-02-04 16:59:57 +08:00
parent c1cf09c6c4 d58411eef9
commit e6244b94fe
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java
+2 -1
View File
@@ -196,7 +196,8 @@ public class HandoverTaskOrderApplicationService {
//pda上传图片插入出库管理 //pda上传图片插入出库管理
stockOutOrderService.update(new LambdaUpdateWrapper<StockOutOrder>() stockOutOrderService.update(new LambdaUpdateWrapper<StockOutOrder>()
.eq(StockOutOrder::getOutOrderNumber,handoverTaskOrderDO.getOrderNumber()) .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
+1 -1
View File
@@ -115,7 +115,7 @@ public class HandoverTaskOrderApi extends BaseController {
return toAjax(handoverTaskOrderApplicationService.completeHandover(handoverTaskOrderDO)); return toAjax(handoverTaskOrderApplicationService.completeHandover(handoverTaskOrderDO));
} }
@ApiOperation("交接作业单APP上传图片") @ApiOperation("交接作业单APP上传图片并出库")
@PostMapping("/pictureApp") @PostMapping("/pictureApp")
public AjaxResult pictureApp(@RequestBody HandoverTaskOrderDTO handoverTaskOrderDTO) { public AjaxResult pictureApp(@RequestBody HandoverTaskOrderDTO handoverTaskOrderDTO) {
HandoverTaskOrderDO handoverTaskOrderDO = handoverTaskOrderAssembler.toDO(handoverTaskOrderDTO); HandoverTaskOrderDO handoverTaskOrderDO = handoverTaskOrderAssembler.toDO(handoverTaskOrderDTO);
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class StockReceiptOrderAppApi extends BaseController {
@ApiOperation("获取收货单") @ApiOperation("获取收货单")
@GetMapping(value = "/getInfoByApp") @GetMapping(value = "/getInfoByApp")
public AjaxResult getInfoByApp(Long receiptOrderId) { public AjaxResult getInfoByApp(Long receiptOrderId) {
return AjaxResult.success(stockReceiptOrderApplicationService.getInfoByApp(receiptOrderId)); return AjaxResult.success(stockReceiptOrderApplicationService.getInfo(receiptOrderId));
} }
/** /**