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

Merge branch 'dev' into pre-production

master
汤建军 8 months ago
parent
86f4977b62 22bba8cb4a
commit
d8567d9903
5 changed files with 48 additions and 61 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. 44
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java
  4. 47
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  5. 14
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

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

@ -1461,15 +1461,15 @@ public class DistributionStockupAppController extends BladeController {
String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue()); String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue());
//进行备货库位上架 //进行备货库位上架
if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ // if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
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);
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); // warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
} // }
//扫码成功 //扫码成功
return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue); return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);
@ -1591,12 +1591,6 @@ public class DistributionStockupAppController extends BladeController {
entity.setBillLadingId(reservationId); entity.setBillLadingId(reservationId);
DistributionStockupEntity byId = distributionStockupService.getById(stockupId); DistributionStockupEntity byId = distributionStockupService.getById(stockupId);
entity.setStockupArea(byId.getStockupArea()); entity.setStockupArea(byId.getStockupArea());
//修改包件备货状态
// one.setOrderPackageStockupStatus(StockupStatusConstant.yibeihuo.getValue());
//todo 待下架操作
// warehouseUpdownTypeClient.downPackage(stockupDTO.getPacketBarCode());
// distributionParcelListService.updateById(one);
} else { } else {
entity.setReservationId(reservationId); entity.setReservationId(reservationId);
} }
@ -1656,16 +1650,16 @@ public class DistributionStockupAppController extends BladeController {
}); });
//查询是否货位数据是否该下架 //查询是否货位数据是否该下架
if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ // if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
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", 1); // jsonObject.put("type", 1);
jsonObject.put("num", 1); // jsonObject.put("num", 1);
//进行了备货库位的选择才进行备货库位的上架 // //进行了备货库位的选择才进行备货库位的上架
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); // warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
} // }
//修改包件备货状态 //修改包件备货状态
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
parcelListEntity.setId(entity.getParcelListId()); parcelListEntity.setId(entity.getParcelListId());

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

@ -13,7 +13,7 @@ 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已完成
/** /**

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

@ -22,7 +22,7 @@ public class StockupZeroDTO implements Serializable {
private String typeService;//备货类型 3 自提 private String typeService;//备货类型 3 自提
private Long reservationId;//预约单id private Long reservationId;//预约单id
private Integer num;//预约单id private Integer num;//预约单id
private Long stockupAllocationId;//备货库位Id // private Long stockupAllocationId;//备货库位Id
private String stockupAllocationName;//备货库位Id private String stockupAllocationName;//备货库位Id
} }

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

@ -1997,14 +1997,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
distributionStockService.saveBatch(list1); distributionStockService.saveBatch(list1);
//备货库位上架 //备货库位上架
JSONObject jsonObject = new JSONObject(); // if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
jsonObject.put("warehouseId", myCurrentWarehouse.getId()); // JSONObject jsonObject = new JSONObject();
jsonObject.put("code", stockupDTO.getTrayBarCode()); // jsonObject.put("warehouseId", myCurrentWarehouse.getId());
// jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); // jsonObject.put("code", stockupDTO.getTrayBarCode());
jsonObject.put("type", 4); // jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("num", list1.size()); // jsonObject.put("type", 4);
// TODO // jsonObject.put("num", list1.size());
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 + "件");
@ -2526,10 +2527,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("请输入正确备货数量 !", "请输入正确备货数量 !"); return Resp.scanFail("请输入正确备货数量 !", "请输入正确备货数量 !");
} }
} }
if (ObjectUtils.isNull(stockupDTO.getStockupAllocationId())) { // if (ObjectUtils.isNull(stockupDTO.getStockupAllocationId())) {
log.error(method + "零担备货参数缺失AllocationId", stockupDTO); // log.error(method + "零担备货参数缺失AllocationId", stockupDTO);
return R.fail(3002, "请扫描备货库位!"); // return R.fail(3002, "请扫描备货库位!");
} // }
//查询预约 //查询预约
DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId());
if (Func.isEmpty(reservationEntity)) { if (Func.isEmpty(reservationEntity)) {
@ -2623,7 +2624,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
stockEntity.setMarketId(stockArticleEntity.getMallId()); stockEntity.setMarketId(stockArticleEntity.getMallId());
stockEntity.setReservationCode(reservationEntity.getReservationCode()); stockEntity.setReservationCode(reservationEntity.getReservationCode());
stockEntity.setStockupArea(stockupDTO.getStockupAllocationName()); stockEntity.setStockupArea(stockupDTO.getStockupAllocationName());
stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId()); // stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
if (Func.isNotEmpty(stockupDTO.getAllocationId())) { if (Func.isNotEmpty(stockupDTO.getAllocationId())) {
log.info(method + "库位备货"); log.info(method + "库位备货");
//查询库位零担 //查询库位零担
@ -2692,16 +2693,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
log.info(method + "无库位无托盘备货"); log.info(method + "无库位无托盘备货");
} }
distributionStockService.save(stockEntity); distributionStockService.save(stockEntity);
if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ // if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
JSONObject jsonObject = new JSONObject(); // JSONObject jsonObject = new JSONObject();
jsonObject.put("warehouseId", myCurrentWarehouse.getId()); // jsonObject.put("warehouseId", myCurrentWarehouse.getId());
jsonObject.put("code", stockArticleEntity.getOrderCode()); // jsonObject.put("code", stockArticleEntity.getOrderCode());
jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); // jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
jsonObject.put("type", 3); // jsonObject.put("type", 3);
jsonObject.put("num", stockupDTO.getNum()); // jsonObject.put("num", stockupDTO.getNum());
//备货库位上架 // //备货库位上架
warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); // warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
} // }
return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件"); return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
} }

14
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
Unescape View File

@ -350,18 +350,10 @@
<select id="findListByExistsAndOrderPackageCodes" resultType="String"> <select id="findListByExistsAndOrderPackageCodes" resultType="String">
select ltad.order_package_code select ltad.order_package_code
from logpm_trunkline_advance_detail ltad from logpm_trunkline_advance_detail ltad
where exists( where ltad.order_package_code in
select 1 from ( <foreach collection="orderPackageCodeGroup" index="ind" item="item" open="(" separator="," close=")">
<foreach collection="orderPackageCodeGroup" index="ind" item="item"> #{item}
<if test="ind == 0">
select #{item} orderPackageCode
</if>
<if test="ind != 0">
union all
select #{item} orderPackageCode
</if>
</foreach> </foreach>
) orderPackageCodes where orderPackageCodes.orderPackageCode = ltad.order_package_code)
</select> </select>

Write Preview
Loading…
Cancel
Save