Compare commits
No commits in common. "9ee983b81cba8dd5e21eb06300cce9bc5d59cd96" and "b6d28d7f308ec5c565d75a30c2fc8eb27a260cff" have entirely different histories.
9ee983b81c
...
b6d28d7f30
|
|
@ -1,8 +1,6 @@
|
|||
package com.nflg.wms.admin.controller;
|
||||
|
||||
/**
|
||||
普通物料收货单
|
||||
*/
|
||||
/* * 普通物料收货单*/
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
|
|
@ -73,23 +71,12 @@ public class NormalPGIController extends BaseController {
|
|||
private IWmsPoReceiptItemService wmsPoReceiptItemService;
|
||||
|
||||
//收货单分页
|
||||
|
||||
/**
|
||||
* 送货单列表
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("search")
|
||||
@ApiMark(moduleName = "送货单管理", apiName = "送货单列表")
|
||||
public ApiResult<PageData<SrmOrderVO>> search(@Valid @RequestBody SRMOrderSearchQO request) {
|
||||
return ApiResult.success(wmsSrmOrderService.search(request));
|
||||
}
|
||||
|
||||
/**
|
||||
* 送货单详情
|
||||
* @param orderId
|
||||
* @return
|
||||
*/
|
||||
//收货单详情
|
||||
@GetMapping("getOrderItem")
|
||||
@ApiMark(moduleName = "送货单管理", apiName = "获取送货单详情")
|
||||
|
|
@ -101,11 +88,7 @@ public class NormalPGIController extends BaseController {
|
|||
return ApiResult.success(srmOrderItemVOS);
|
||||
}
|
||||
|
||||
/**
|
||||
* PDA扫描送货单号获取送货单详情
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
|
||||
//PDA 扫码获取收货信息
|
||||
@GetMapping("getOrderItemByOrderNo")
|
||||
@ApiMark(moduleName = "送货单管理", apiName = "PDA扫描送货单号获取送货单详情")
|
||||
|
|
@ -114,11 +97,7 @@ public class NormalPGIController extends BaseController {
|
|||
return ApiResult.success(pdaOrderVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取扫码的详情信息
|
||||
* @param orderItemId
|
||||
* @return
|
||||
*/
|
||||
|
||||
// 查看扫码记录
|
||||
@GetMapping("getScanCodes")
|
||||
@ApiMark(moduleName = "送货单管理", apiName = "获取扫码的详情信息")
|
||||
|
|
@ -332,12 +311,6 @@ public class NormalPGIController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* 收货确认(PDA使用)
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
//收货确认
|
||||
@PostMapping("takeDelivery")
|
||||
@ApiMark(moduleName = "送货单管理", apiName = "收货确认")
|
||||
|
|
@ -402,13 +375,6 @@ public class NormalPGIController extends BaseController {
|
|||
return ApiResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取SRM同步参数
|
||||
*
|
||||
* @param request
|
||||
* @param order
|
||||
* @return
|
||||
*/
|
||||
|
||||
@GetMapping("task")
|
||||
@ApiMark(moduleName = "送货单管理", apiName = "普通物料上架任务")
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ server:
|
|||
port: 8101
|
||||
spring:
|
||||
application:
|
||||
name: auth-local
|
||||
name: auth
|
||||
profiles:
|
||||
active: sit
|
||||
config:
|
||||
|
|
|
|||
Loading…
Reference in New Issue