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

自提备货库位零担上架

dist.1.3.0
汤建军 11 months ago
parent
81f4c48cb6
commit
fd5047f3ad
4 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java
  3. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  4. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java

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

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

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java
Unescape View File

@ -13,8 +13,8 @@ public class StockupDTO implements Serializable {
private String stockupDateEnd;//备货日期 private String stockupDateEnd;//备货日期
private Integer status;//0未完成 1已完成 private Integer status;//0未完成 1已完成
// private Long stockupAllocationId;//0未完成 1已完成 private Long stockupAllocationId;//0未完成 1已完成
// private String stockupAllocationName;//0未完成 1已完成 private String stockupAllocationName;//0未完成 1已完成
/** /**
* 客户名城 * 客户名城

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

@ -2004,7 +2004,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
jsonObject.put("type", 4); jsonObject.put("type", 4);
jsonObject.put("num", list1.size()); jsonObject.put("num", list1.size());
// TODO // TODO
// warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
} }
int i = list1.isEmpty() ? 0 : list1.size(); int i = list1.isEmpty() ? 0 : list1.size();
return Resp.scanSuccess("整托拣货" + i + "件", "整托拣货" + i + "件"); return Resp.scanSuccess("整托拣货" + i + "件", "整托拣货" + i + "件");
@ -2700,7 +2700,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
jsonObject.put("num", stockupDTO.getNum()); jsonObject.put("num", stockupDTO.getNum());
//备货库位上架 //备货库位上架
//TODO //TODO
// warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件"); return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
} }

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
Unescape View File

@ -171,7 +171,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
.eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, warehouseId) .eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, warehouseId)
.eq(WarehouseUpdownStockupAreaEntity::getAssociationId, stockArticleEntity.getId()) .eq(WarehouseUpdownStockupAreaEntity::getAssociationId, stockArticleEntity.getId())
.eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, stockArticleEntity.getOrderCode()) .eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, stockArticleEntity.getOrderCode())
.eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, "3") .eq(WarehouseUpdownStockupAreaEntity::getGoodsType, "3")
); );
if (Func.isEmpty(updownStockupAreaEntity)) { if (Func.isEmpty(updownStockupAreaEntity)) {
warehouseUpdownStockupArea.setAssociationValue(stockArticleEntity.getOrderCode()); warehouseUpdownStockupArea.setAssociationValue(stockArticleEntity.getOrderCode());
@ -181,7 +181,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
warehouseUpdownStockupArea.setGoodsName(stockArticleEntity.getDescriptionGoods()); warehouseUpdownStockupArea.setGoodsName(stockArticleEntity.getDescriptionGoods());
warehouseUpdownStockupArea.setMarketName(stockArticleEntity.getMallName()); warehouseUpdownStockupArea.setMarketName(stockArticleEntity.getMallName());
warehouseUpdownStockupArea.setMarketId(stockArticleEntity.getMallId()); warehouseUpdownStockupArea.setMarketId(stockArticleEntity.getMallId());
warehouseUpdownStockupArea.setGoodsType("2"); warehouseUpdownStockupArea.setGoodsType("3");
this.save(warehouseUpdownStockupArea); this.save(warehouseUpdownStockupArea);
} else { } else {
int newNum = updownStockupAreaEntity.getNum() + num; int newNum = updownStockupAreaEntity.getNum() + num;
@ -217,7 +217,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
warehouseUpdownStockupAreaLogEntity.setNum(num); warehouseUpdownStockupAreaLogEntity.setNum(num);
warehouseUpdownStockupAreaLogService.save(warehouseUpdownStockupAreaLogEntity); warehouseUpdownStockupAreaLogService.save(warehouseUpdownStockupAreaLogEntity);
//修改库位状态 //修改库位状态
basicdataGoodsAllocationClient.updateAllocationStatus(stockUpAllocationId,"2"); basicdataGoodsAllocationClient.updateAllocationStatus(stockUpAllocationId,"3");
return null; return null;
} }

Write Preview
Loading…
Cancel
Save