diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 28a20749..ff7bde43 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -1,6 +1,8 @@ package com.nflg.wms.admin.controller; -/* * 普通物料收货单*/ +/** + 普通物料收货单 + */ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; @@ -71,12 +73,23 @@ public class NormalPGIController extends BaseController { private IWmsPoReceiptItemService wmsPoReceiptItemService; //收货单分页 + + /** + * 送货单列表 + * @param request + * @return + */ @PostMapping("search") @ApiMark(moduleName = "送货单管理", apiName = "送货单列表") public ApiResult> search(@Valid @RequestBody SRMOrderSearchQO request) { return ApiResult.success(wmsSrmOrderService.search(request)); } + /** + * 送货单详情 + * @param orderId + * @return + */ //收货单详情 @GetMapping("getOrderItem") @ApiMark(moduleName = "送货单管理", apiName = "获取送货单详情") @@ -88,7 +101,11 @@ public class NormalPGIController extends BaseController { return ApiResult.success(srmOrderItemVOS); } - + /** + * PDA扫描送货单号获取送货单详情 + * @param + * @return + */ //PDA 扫码获取收货信息 @GetMapping("getOrderItemByOrderNo") @ApiMark(moduleName = "送货单管理", apiName = "PDA扫描送货单号获取送货单详情") @@ -97,7 +114,11 @@ public class NormalPGIController extends BaseController { return ApiResult.success(pdaOrderVO); } - + /** + * 获取扫码的详情信息 + * @param orderItemId + * @return + */ // 查看扫码记录 @GetMapping("getScanCodes") @ApiMark(moduleName = "送货单管理", apiName = "获取扫码的详情信息") @@ -311,6 +332,12 @@ public class NormalPGIController extends BaseController { } + /** + * 收货确认(PDA使用) + * + * @param request + * @return + */ //收货确认 @PostMapping("takeDelivery") @ApiMark(moduleName = "送货单管理", apiName = "收货确认") @@ -375,6 +402,13 @@ public class NormalPGIController extends BaseController { return ApiResult.success(); } + /** + * 获取SRM同步参数 + * + * @param request + * @param order + * @return + */ @GetMapping("task") @ApiMark(moduleName = "送货单管理", apiName = "普通物料上架任务") diff --git a/nflg-wms-auth/src/main/resources/application.yml b/nflg-wms-auth/src/main/resources/application.yml index 4053b23c..058150cd 100644 --- a/nflg-wms-auth/src/main/resources/application.yml +++ b/nflg-wms-auth/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 8101 spring: application: - name: auth + name: auth-local profiles: active: sit config: