wms / wms_shandonghaiwang · Commits

Commit 714439c2429e27ac698f2d22c7d7152508c4773f

Authored by 易文鹏
1 parent 629797bd

更改出库单默认排序规则

Inline Side-by-side
Showing 5 changed files with 12 additions and 10 deletions
src/main/java/com/huaheng/api/wcs/controller/ArrivedNoticeController.java
  View file @714439c
... ... @@ -42,15 +42,15 @@ public class ArrivedNoticeController extends BaseController {
42 42  
43 43 @PostMapping("/arrivedNotice")
44 44 @ApiOperation("到达拣选台")
45   - @ApiLogger(apiName = "到达拣选台", from="ROBOT")
  45 + @ApiLogger(apiName = "wcs到达拣选台", from="ROBOT")
46 46 @Transactional(rollbackFor = Exception.class)
47 47 @ResponseBody
48 48 public AjaxResult arrivedNotice(@RequestBody Map<String,String> map) {
49   - String warehouseCode = "CS0001";
  49 + //String warehouseCode = "CS0001";
50 50 String taskNo = map.get("taskNo");
51   - String port = map.get("port");
52   - String msg = map.get("msg");
53   - String state = map.get("state");
  51 + //String port = map.get("port");
  52 + //String msg = map.get("msg");
  53 + //String state = map.get("state");
54 54 LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
55 55 taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskNo);
56 56 TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
... ... @@ -59,7 +59,7 @@ public class ArrivedNoticeController extends BaseController {
59 59 } else {
60 60 return AjaxResult.error("没有找到任务taskNo:" + taskNo);
61 61 }
62   - int taskType = taskHeader.getTaskType();
  62 + //int taskType = taskHeader.getTaskType();
63 63 int status = taskHeader.getStatus();
64 64 if(status == QuantityConstant.TASK_STATUS_COMPLETED) {
65 65 return AjaxResult.success("更新到达站台成功, 任务已经完成");
... ...
src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java
  View file @714439c
... ... @@ -33,7 +33,7 @@ public class WarecellAllocation extends BaseController {
33 33 @PostMapping("/warecellAllocation")
34 34 @ApiOperation(value="wcs仓位分配", notes="wcs仓位分配", httpMethod = "POST")
35 35 @ResponseBody
36   - @ApiLogger(apiName = "仓位分配", from="WCS")
  36 + @ApiLogger(apiName = "wcs调用wms分配库位", from="WCS")
37 37 /*
38 38 WCS给的长，宽，高，重在有不同规格库位才有用，destination是区域， locationType库位类型
39 39 */
... ...
src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceServiceImpl.java
  View file @714439c
... ... @@ -88,11 +88,11 @@ public class ShipmentPreferenceServiceImpl extends ServiceImpl&lt;ShipmentPreferenc
88 88 if (StringUtils.isNotEmpty(code)) {
89 89 ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getCode, code));
90 90 if (shipmentHeader == null || shipmentHeader.getFirstStatus() >= QuantityConstant.SHIPMENT_HEADER_COMPLETED) {
91   - throw new ServiceException("单据结束，不能组盘");
  91 + throw new ServiceException("已全部组盘");
92 92 }
93 93 }
94 94 List<ShipmentHeader> shipmentHeaderList = new ArrayList<>();
95   - if (statusFlowDetail != null && statusFlowDetail.getNessary().intValue() == 1) {
  95 + if (statusFlowDetail != null && statusFlowDetail.getNessary() == 1) {
96 96 if (StringUtils.isNotEmpty(ids)) {
97 97 for (Integer id : Convert.toIntArray(ids)) {
98 98 //判断单据是否按出库流程操作
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @714439c
... ... @@ -144,8 +144,8 @@ public class ShipmentHeaderController extends BaseController {
144 144 .between(StringUtils.isNotNull(startTime), ShipmentHeader::getRequestedDeliveryDate, startTime,endTime)
145 145 .eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
146 146 .eq(shipmentHeader.getLastStatus()!=null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus())
147   - .orderByAsc(ShipmentHeader::getRequestedDeliveryDate)
148 147 .orderByAsc(ShipmentHeader::getLastStatus)
  148 + .orderByAsc(ShipmentHeader::getRequestedDeliveryDate)
149 149 .orderByAsc(ShipmentHeader::getCreated);
150 150  
151 151 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @714439c
... ... @@ -11,6 +11,7 @@ import com.huaheng.common.exception.service.ServiceException;
11 11 import com.huaheng.common.support.Convert;
12 12 import com.huaheng.common.utils.StringUtils;
13 13 import com.huaheng.common.utils.security.ShiroUtils;
  14 +import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
14 15 import com.huaheng.framework.aspectj.lang.annotation.Log;
15 16 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
16 17 import com.huaheng.framework.web.controller.BaseController;
... ... @@ -204,6 +205,7 @@ public class TaskHeaderController extends BaseController {
204 205 @RequiresPermissions("task:taskHeader:remove")
205 206 @Log(title = "任务-任务管理", operating = "删除立库任务", action = BusinessType.DELETE)
206 207 @PostMapping( "/remove")
  208 + @ApiLogger(apiName = "wcs取消任务", from="WCS")
207 209 @ResponseBody
208 210 public AjaxResult remove(String ids)
209 211 {
... ...