wms / wms_guangzhouwanbao · Commits

Commit a17c5d59b4cf36d7a5770959f55b326d9d767041

Authored by DESKTOP-AO0VKC8\mahua
2 parents 60fc6633 b58e436f

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 3 changed files with 11 additions and 9 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
  View file @a17c5d5
... ... @@ -289,7 +289,7 @@ public class ShipmentTaskService {
289 289 task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
290 290 taskHeaderService.updateById(task);
291 291 /* 更新库位和容器*/
292   - updateLocationContainer(task.getFromLocation(), task.getToLocation(), task.getContainerCode(), task.getTaskType());
  292 + updateShipmentLocationContainer(task.getFromLocation(), task.getToLocation(), task.getContainerCode(), task.getTaskType());
293 293  
294 294 //设置出库货箱表头状态为拣货任务完成
295 295 LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
... ... @@ -341,7 +341,7 @@ public class ShipmentTaskService {
341 341 * @param containerCode 容器编码
342 342 * @param taskType 任务类型
343 343 */
344   - public void updateLocationContainer(String fromLocation, String toLocation, String containerCode, Integer taskType){
  344 + public void updateShipmentLocationContainer(String fromLocation, String toLocation, String containerCode, Integer taskType){
345 345 //将库位状态改为空闲，如果是整出的对应的容器也清空
346 346 Location fromLocationRecord = locationService.findLocationByCode(fromLocation);
347 347 if (StringUtils.isNull(fromLocationRecord)) {
... ... @@ -384,10 +384,12 @@ public class ShipmentTaskService {
384 384 //查询是否存在关联的库存，入如果没有就修改容器状态为empty
385 385 LambdaQueryWrapper<InventoryDetail> inventoryDetaillambdaQueryWrapper = Wrappers.lambdaQuery();
386 386 inventoryDetaillambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode);
387   - List<InventoryDetail> detailList = inventoryDetailService.list();
  387 + List<InventoryDetail> detailList = inventoryDetailService.list(inventoryDetaillambdaQueryWrapper);
388 388 //库存查询不到该容器就把容器状态改为可用
389 389 if (detailList.isEmpty()) {
390   - containerService.updateLocationCodeAndStatus(containerCode, "", "empty");
  390 + containerService.updateLocationCodeAndStatus(containerCode, toLocation, "empty");
  391 + } else {
  392 + containerService.updateLocationCodeAndStatus(containerCode, toLocation, "some");
391 393 }
392 394 }
393 395 }
... ...
src/main/resources/application-druid.properties
  View file @a17c5d5
... ... @@ -12,12 +12,12 @@ spring.datasource.druid.master.password=HHrobot123.
12 12 #spring.datasource.druid.master.password=hhsoftware
13 13 # 从库
14 14 spring.datasource.druid.slave.open = false
15   -spring.datasource.druid.slave.url=jdbc:mysql://199.19.109.117:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
  15 +spring.datasource.druid.slave.url=jdbc:mysql://117.62.222.186:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
16 16 #spring.datasource.druid.master.username=softhuaheng
17 17 #spring.datasource.druid.master.password=HHrobot123.
18 18 # 初始连接数
19 19 spring.datasource.druid.initial-size=4
20   -# 最大连接池数量
  20 +# 最大连接池数量,以当前CPU核数加2
21 21 spring.datasource.druid.max-active=10
22 22 # 最小连接池数量
23 23 spring.datasource.druid.min-idle=4
... ... @@ -47,5 +47,3 @@ logging.level.com.huaheng=debug
47 47 logging.level.org.springframework=warn
48 48 logging.level.spring.springboot.dao=DEBUG
49 49  
50   -#锟斤拷锟皆凤拷锟斤拷丝凇锟斤拷锟斤拷锟斤拷锟侥縞ontextPath
51   -server.servlet.context-path= /wms
... ...
src/main/resources/application.yml
  View file @a17c5d5
... ... @@ -17,7 +17,7 @@ huaheng:
17 17 # 获取ip地址开关
18 18 addressEnabled: false
19 19  
20   -#测试服务端口、测试项目contextPath
  20 +#服务端口、项目contextPath
21 21 server:
22 22 tomcat:
23 23 uri-encoding: UTF-8
... ... @@ -36,6 +36,8 @@ server:
36 36 # 是否分配的直接内存
37 37 direct-buffers: true
38 38 port: 8888
  39 + servlet:
  40 + context-path: /wms
39 41  
40 42 # 用户配置
41 43 user:
... ...