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

取消备货库位扫描参数传递

master
汤建军 10 months ago
parent
e30daabf58
commit
f7a1b24d29
2 changed files with 13 additions and 13 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. 22
      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

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

@ -1436,8 +1436,8 @@ public class DistributionStockupAppController extends BladeController {
entity.setType(2); entity.setType(2);
entity.setAllocationId(stockupDTO.getAllocationId()); entity.setAllocationId(stockupDTO.getAllocationId());
entity.setOutboundType(stockupEntity.getTypeService()); entity.setOutboundType(stockupEntity.getTypeService());
entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); // entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
entity.setStockupArea(stockupDTO.getStockupAllocationName()); // entity.setStockupArea(stockupDTO.getStockupAllocationName());
distributionStockService.save(entity); distributionStockService.save(entity);
// //修改备货时间 // //修改备货时间
distributionAsyncService.updateStockupStockListDate(stockupDTO); distributionAsyncService.updateStockupStockListDate(stockupDTO);
@ -1464,7 +1464,7 @@ public class DistributionStockupAppController extends BladeController {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId()); jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code",packetBarCode); jsonObject.put("code",packetBarCode);
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); // jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 2); jsonObject.put("type", 2);
jsonObject.put("num", 1); jsonObject.put("num", 1);
//TODO //TODO
@ -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) {
@ -1613,8 +1613,8 @@ public class DistributionStockupAppController extends BladeController {
entity.setConditions("0"); entity.setConditions("0");
entity.setType(2); entity.setType(2);
entity.setOutboundType(distributionStockupEntity.getTypeService()); entity.setOutboundType(distributionStockupEntity.getTypeService());
entity.setStockupArea(stockupDTO.getStockupAllocationName()); // entity.setStockupArea(stockupDTO.getStockupAllocationName());
entity.setStockupAreaId(stockupDTO.getStockupAllocationId()); // entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
distributionStockService.save(entity); distributionStockService.save(entity);
//修改订单备货状态 //修改订单备货状态
distributionAsyncService.updateStockArticleStock(one.getStockArticleId()); distributionAsyncService.updateStockArticleStock(one.getStockArticleId());
@ -1657,7 +1657,7 @@ public class DistributionStockupAppController extends BladeController {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId()); jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code",packetBarCode); jsonObject.put("code",packetBarCode);
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); // jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 2); jsonObject.put("type", 2);
jsonObject.put("num", 1); jsonObject.put("num", 1);
//进行了备货库位的选择才进行备货库位的上架 //进行了备货库位的选择才进行备货库位的上架

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已完成
/** /**
* 客户名城 * 客户名城

Write Preview
Loading…
Cancel
Save