java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

备货库位上架修复

dist.1.3.0
汤建军 8 months ago
parent
be9b37c2f7
commit
8730d2ad45
2 changed files with 35 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
  2. 19
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

46
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
Unescape View File

@ -1461,14 +1461,16 @@ public class DistributionStockupAppController extends BladeController {
String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue());
//进行备货库位上架
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code",packetBarCode);
// jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 2);
jsonObject.put("num", 1);
//TODO
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code",packetBarCode);
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 2);
jsonObject.put("num", 1);
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
}
//扫码成功
return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);
case 2:
@ -1534,7 +1536,7 @@ public class DistributionStockupAppController extends BladeController {
String packetBarCode = stockupDTO.getPacketBarCode();//包件码
Long stockupId = stockupDTO.getStockupId();//备货任务ID
Long reservationId = stockupDTO.getReservationId();//预约单id
Long stockUpAllocationId = stockupDTO.getStockupAllocationId();//备货库位ID
// Long stockUpAllocationId = stockupDTO.getStockupAllocationId();//备货库位ID
if (Objects.isNull(myCurrentWarehouse)) {
log.warn("##################stockupScan: 未选择仓库，订单自编号为空");
return R.fail(403,"未授权!!");
@ -1555,10 +1557,10 @@ public class DistributionStockupAppController extends BladeController {
log.warn("##################stockupScan: 包件扫码，预约单id为空");
return R.fail("包件扫码:预约单id不能为空");
}
if (Objects.isNull(stockUpAllocationId)) {
log.warn("##################stockupScan: 备货库位不存在，stockUpAllocationId:{}",stockUpAllocationId);
return Resp.scanFail("请扫描备货库位","请扫描备货库位");
}
// if (Objects.isNull(stockUpAllocationId)) {
// log.warn("##################stockupScan: 备货库位不存在，stockUpAllocationId:{}",stockUpAllocationId);
// return Resp.scanFail("请扫描备货库位","请扫描备货库位");
// }
Integer integer = distributionStockupService.selectPackage(stockupDTO);
switch (integer) {
@ -1654,14 +1656,16 @@ public class DistributionStockupAppController extends BladeController {
});
//查询是否货位数据是否该下架
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code",packetBarCode);
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 1);
jsonObject.put("num", 1);
//进行了备货库位的选择才进行备货库位的上架
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code",packetBarCode);
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 1);
jsonObject.put("num", 1);
//进行了备货库位的选择才进行备货库位的上架
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
}
//修改包件备货状态
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
parcelListEntity.setId(entity.getParcelListId());

19
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -2692,15 +2692,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
log.info(method + "无库位无托盘备货");
}
distributionStockService.save(stockEntity);
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code", stockArticleEntity.getOrderCode());
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 3);
jsonObject.put("num", stockupDTO.getNum());
//备货库位上架
//TODO
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code", stockArticleEntity.getOrderCode());
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 3);
jsonObject.put("num", stockupDTO.getNum());
//备货库位上架
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
}
return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
}

Write Preview
Loading…
Cancel
Save