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

1.bug修复

dist.1.3.0
zhenghaoyu 6 months ago
parent
6a035e2bec
commit
33ab46a733
13 changed files with 305 additions and 28 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. 8
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
  2. 1
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java
  3. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java
  4. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  5. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  6. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
  7. 12
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
  8. 63
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  9. 60
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  10. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehousePackageTrackLogService.java
  11. 17
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehousePackageTrackLogServiceImpl.java
  12. 84
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
  13. 64
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

8
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
Unescape View File

@ -134,4 +134,12 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
@ApiModelProperty(name = "卸车时间",notes = "")
private Date unloadTime;
/** 卸车托盘名称 */
@ApiModelProperty(name = "卸车托盘名称",notes = "")
private String unloadTrayName;
/** 卸车托盘编码 */
@ApiModelProperty(name = "卸车托盘编码",notes = "")
private String unloadTrayCode;
}

1
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java
Unescape View File

@ -27,6 +27,7 @@ public class OrderDetailInfoVO implements Serializable {
private Integer quantity;
private String trayCode;
private String trayName;
private String goodsAllocation;
private BigDecimal weight;
private BigDecimal volume;
private String sendDateStr;

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java
Unescape View File

@ -555,7 +555,7 @@ public class CarsLoadApiController {
return R.fail(405,"入库类型为空");
}
return carsLoadService.unloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车",incomingType);
return carsLoadService.unloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车",incomingType,null,null);
}catch (CustomerException e){
log.error(e.message,e);
return R.fail(e.code,e.message);
@ -601,7 +601,7 @@ public class CarsLoadApiController {
return R.fail(405,"订单号为空");
}
return carsLoadService.unloadZero(loadId,waybillNo,enterNum,myCurrentWarehouse.getId(),1,trayCode,orderCode,"零担正常卸车");
return carsLoadService.unloadZero(loadId,waybillNo,enterNum,myCurrentWarehouse.getId(),1,trayCode,orderCode,"零担正常卸车",null,null);
}catch (CustomerException e){
log.error(e.message,e);
return R.fail(e.code,e.message);

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

@ -240,7 +240,8 @@
lta.service_num serviceNumber,
ltad.quantity quantity,
lwtg.tray_code trayCode,
lwt.pallet_name trayName,
ldpl.pallet trayName,
ldpl.goods_allocation goodsAllocation,
ltad.weight weight,
ltad.volume volume,
ltad.send_date_str sendDateStr,
@ -256,8 +257,7 @@
lta.create_time createTime
from logpm_trunkline_advance_detail ltad
left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ltad.order_package_code and lwtg.warehouse_id = ltad.now_warehouse_id
left join logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltad.order_package_code and ldpl.warehouse_id = ltad.now_warehouse_id
left join (select ltcls.* from logpm_trunkline_cars_load_scan ltcls
join (
select cls.scan_code,

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

@ -51,6 +51,9 @@
<if test="param.loadStatus != null and param.loadStatus != ''">
and ltcl.load_status = #{param.loadStatus}
</if>
<if test="param.warehouseName != null and param.warehouseName != ''">
and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0)
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,
@ -469,6 +472,9 @@
<if test="param.endTime != null">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.warehouseName != null and param.warehouseName != ''">
and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0)
</if>
</select>
<select id="findZeroListByWarehouseId" resultType="com.alibaba.fastjson.JSONObject">

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
Unescape View File

@ -92,9 +92,9 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
R arriveUnloadPageList(LoadCarsDTO loadCarsDTO);
R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray,String remark,Integer incomingType);
R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray,String remark,Integer incomingType,String unloadTrayName,String unloadTrayCode);
R unloadZero(Long loadId, String waybillNo,Integer enterNum, Long warehouseId,Integer unbindTray,String trayCode,String orderCode,String remark);
R unloadZero(Long loadId, String waybillNo,Integer enterNum, Long warehouseId,Integer unbindTray,String trayCode,String orderCode,String remark,String unloadTrayName,String unloadTrayCode);
R findLoadScanWaybillDetailList(Long loadId, String orderCode, Long warehouseId);

12
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
Unescape View File

@ -227,6 +227,18 @@ public class InComingServiceImpl implements IInComingService {
log.warn("############incomingPackage: 包件不存在 packageCodes={} warehouseId={}", packageCodes, warehouseId);
return Resp.scanFail(405, "包件无数据", "包件无数据");
}
if(incomingType == 1 && incomingType == 2){
for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : advanceDetailEntityList) {
Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId();
if(!warehouseId1.equals(warehouseId)){
log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId);
return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓");
}
}
}
if(StringUtil.isNotBlank(customerTrain)){
for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) {
String trainNumber = advanceDetailEntity.getTrainNumber();

63
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -36,7 +36,7 @@ import org.springblade.common.annotations.RepeatSubmit;
import org.springblade.common.constant.CodeNumConstant;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.IncomingTypeEnum;
import org.springblade.common.constant.RabbitConstant;
import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.order.*;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.CommonUtil;
@ -2166,8 +2166,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
stockArticleEntity.setConsigneeMobile(consigneeMobile);
});
List<String> arriveWarehousePackageCode = new ArrayList<>();
List<String> noArriveWarehousePackageCode = new ArrayList<>();
parcelListEntityList.forEach(parcelListEntity -> {
Long nowWarehouseId = parcelListEntity.getWarehouseId();
String orderPackageCode = parcelListEntity.getOrderPackageCode();
String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
parcelListEntity.setSendWarehouseId(departureWarehouseId);
parcelListEntity.setSendWarehouseName(departureWarehouseName);
parcelListEntity.setAcceptWarehouseId(destinationWarehouseId);
@ -2175,8 +2179,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
if(nowWarehouseId.equals(destinationWarehouseId)){
parcelListEntity.setIsTransfer(0);
if("20".equals(orderPackageStatus)){
arriveWarehousePackageCode.add(orderPackageCode);
}
}else{
parcelListEntity.setIsTransfer(1);
if("20".equals(orderPackageStatus)){
noArriveWarehousePackageCode.add(orderPackageCode);
}
}
});
@ -2186,10 +2196,33 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
if(CollUtil.isNotEmpty(parcelListEntityList)){
distributionParcelListClient.updateList(parcelListEntityList);
}
if(CollUtil.isNotEmpty(arriveWarehousePackageCode)){
QueryWrapper<TrunklineWaybillPackageEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.in("order_package_code",arriveWarehousePackageCode)
.eq("is_deleted",0);
List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = trunklineWaybillPackageService.list(queryWrapper);
if(!trunklineWaybillPackageEntities.isEmpty()){
for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : trunklineWaybillPackageEntities) {
trunklineWaybillPackageEntity.setPackageStatus(WorkNodeEnums.END_WAREHOUSE_UNLOADING.getCode());
}
trunklineWaybillPackageService.updateBatchById(trunklineWaybillPackageEntities);
}
}
if(CollUtil.isNotEmpty(noArriveWarehousePackageCode)){
QueryWrapper<TrunklineWaybillPackageEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.in("order_package_code",noArriveWarehousePackageCode)
.eq("is_deleted",0);
List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = trunklineWaybillPackageService.list(queryWrapper);
if(!trunklineWaybillPackageEntities.isEmpty()){
for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : trunklineWaybillPackageEntities) {
trunklineWaybillPackageEntity.setPackageStatus(WorkNodeEnums.INITIAL_WAREHOUSE_DEPART.getCode());
}
trunklineWaybillPackageService.updateBatchById(trunklineWaybillPackageEntities);
}
}
trunklineWaybillPackageService.updateWaybillStatus(waybillEntity);
}
openOrderAsyncService.sendUpdateWaybillFanout(waybillEntity,wayBillDetailList,advanceIds,oldConsignee);
return R.success("改单成功");
}
@ -3484,6 +3517,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
log.warn("#################verifyUpdateData: 明细不存在");
continue;
}
String newGoodsName = waybillDetailDTO.getGoodsName();
String goodsName = warehouseWayBillDetail.getProductName();
if(!Objects.equals(newGoodsName,goodsName)){
// stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 数量修改").append(num).append("-->").append(newNum).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
editOrderMsgVO.setItemName("明细更新 "+warehouseWayBillDetail.getProductName() +" 品类修改 ");
editOrderMsgVO.setOldValue(goodsName);
editOrderMsgVO.setNewValue(newGoodsName);
msgList.add(editOrderMsgVO);
}
Integer newNum = waybillDetailDTO.getNum();
Integer num = warehouseWayBillDetail.getNum();
if(!num.equals(newNum)){
@ -4019,6 +4065,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
log.warn("#################verifyUpdateData: 明细不存在");
continue;
}
String newGoodsName = waybillDetailDTO.getGoodsName();
Long goodsId = waybillDetailDTO.getGoodsId();
String productName = warehouseWayBillDetail.getProductName();
if (!ObjectUtil.equals(productName,newGoodsName)) {
stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 品类修改").append(productName).append("-->").append(newGoodsName).append(";");
warehouseWayBillDetail.setProductId(goodsId);
warehouseWayBillDetail.setProductName(newGoodsName);
}
Integer newNum = waybillDetailDTO.getNum();
Integer num = warehouseWayBillDetail.getNum();
if (!ObjectUtil.equals(num,newNum)) {

60
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -2562,7 +2562,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<String> orderPackageCodes = new ArrayList<>();
orderPackageCodes.add(orderPackageCode);
String content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName;
String content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车, 车次号："+loadCode+" ,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName;
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), content);
trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1,
@ -2756,7 +2756,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Integer num = carsLoadScanEntity.getNum();
if (useNum - num + enterNum > handQuantity) {
int i = enterNum - num;
int i1 = handQuantity - i;
if (i1 < 0) {
log.warn("##################loadingZero: 不能大于在库件数 handQuantity={} real={}", handQuantity, useNum - num + enterNum);
return R.fail(405, "不能大于在库件数");
}
@ -3464,9 +3467,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Long warehouseId = loadCarsDTO.getWarehouseId();
Integer incomingType = loadCarsDTO.getIncomingType();
BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
if(Objects.isNull(basicdataTrayEntity)){
log.warn("#############unloadTrayAllOne: 托盘信息不存在 trayCode={}",trayCode);
return R.fail(405,"托盘信息不存在");
}
String palletName = basicdataTrayEntity.getPalletName();
String orders = null;
if (0 == isZero) {
unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车", incomingType);
unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车", incomingType,palletName,trayCode);
Map<String, Object> map = new HashMap<>();
map.put("trayType", trayType);
map.put("trayCode", trayCode);
@ -3483,7 +3493,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
} else {
unloadZero(loadId, waybillNo, enterNum, warehouseId, 1, null, orderCode, "卸分一体 卸车");
unloadZero(loadId, waybillNo, enterNum, warehouseId, 1, null, orderCode, "卸分一体 卸车",palletName,trayCode);
Map<String, Object> map = new HashMap<>();
map.put("trayType", trayType);
@ -3975,7 +3985,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Integer enterNum = unloadZeroDTO.getEnterNum();
String trayCode = unloadZeroDTO.getTrayCode();
String orderCode = unloadZeroDTO.getOrderCode();
unloadZero(loadId, waybillNo, enterNum, warehouseId, 1, trayCode, orderCode, "批量卸车零担正常卸车");
unloadZero(loadId, waybillNo, enterNum, warehouseId, 1, trayCode, orderCode, "批量卸车零担正常卸车",null,null);
}
List<Long> carsLoadScanIds = new ArrayList<>();
@ -6142,7 +6152,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if(StringUtil.isNotBlank(trayCode)){
unbingTray = 1;
}
unloadPackageNoXz(loadId,scanCode,warehouseId,unbingTray,IncomingTypeEnum.ABNORMAL_INCOMING.getValue(),IncomingTypeEnum.ABNORMAL_INCOMING.getCode());
unloadPackageNoXz(loadId,scanCode,warehouseId,unbingTray,IncomingTypeEnum.ABNORMAL_INCOMING.getValue(),IncomingTypeEnum.ABNORMAL_INCOMING.getCode(),null,null);
}else{
String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
if("20".equals(orderPackageStatus)){
@ -6153,7 +6163,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if(StringUtil.isNotBlank(trayCode)){
unbingTray = 1;
}
unloadPackageNoXz(loadId,scanCode,warehouseId,unbingTray,IncomingTypeEnum.ABNORMAL_INCOMING.getValue(),IncomingTypeEnum.ABNORMAL_INCOMING.getCode());
unloadPackageNoXz(loadId,scanCode,warehouseId,unbingTray,IncomingTypeEnum.ABNORMAL_INCOMING.getValue(),IncomingTypeEnum.ABNORMAL_INCOMING.getCode(),null,null);
}
}
}else{
@ -6619,7 +6629,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
@Override
public R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType) {
public R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
log.info("#############unloadPackage: 卸车包件");
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@ -6711,6 +6721,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
trunklineCarsLoadScanEntity.setUnloadTime(new Date());
trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
loadScanId = trunklineCarsLoadScanEntity.getId();
@ -6750,6 +6762,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsLoadScanEntity.setUnloadTime(new Date());
trunklineCarsLoadScanEntity.setFromWarehouseId(nowWarehouseId);
trunklineCarsLoadScanEntity.setRemark("无装车记录卸车");
trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
loadScanId = trunklineCarsLoadScanEntity.getId();
@ -6886,6 +6900,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
trunklineCarsLoadScanEntity.setUnloadTime(new Date());
trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
loadScanId = trunklineCarsLoadScanEntity.getId();
@ -6938,6 +6954,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
trunklineCarsLoadScanEntity.setUnloadTime(new Date());
trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
isData = 1;
@ -7065,6 +7083,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setScanStatus("2");
carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
carsLoadScanEntity.setUnloadTime(new Date());
carsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
carsLoadScanEntity.setUnloadTrayName(unloadTrayName);
trayCode = carsLoadScanEntity.getTrayCode();
if (!StringUtil.isBlank(trayCode)) {
BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
@ -7214,6 +7234,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
carsLoadScanEntity.setUnloadTime(new Date());
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
carsLoadScanEntity.setUnloadTrayName(unloadTrayName);
isData = 1;
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
@ -7229,7 +7251,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<String> orderPackageCodes = new ArrayList<>();
orderPackageCodes.add(orderPackageCode);
String content = "包件在 " + warehouseName + "卸车，卸车方式：" + IncomingTypeEnum.getValue(incomingType);
String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(incomingType)+ (StringUtil.isNotBlank(unloadTrayName)?"托盘："+unloadTrayName:"");
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);
try {
if (StrUtil.isNotEmpty(orderCode)) {
@ -7283,7 +7305,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
public R unloadPackageNoXz(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType) {
public R unloadPackageNoXz(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
log.info("#############unloadPackage: 卸车包件");
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@ -7893,7 +7915,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<String> orderPackageCodes = new ArrayList<>();
orderPackageCodes.add(orderPackageCode);
String content = "包件在 " + warehouseName + "卸车，卸车方式：" + IncomingTypeEnum.getValue(incomingType);
String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" ，卸车方式：" + IncomingTypeEnum.getValue(incomingType)+ (StringUtil.isNotBlank(unloadTrayName)?"托盘："+unloadTrayName:"");
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);
try {
if (StrUtil.isNotEmpty(orderCode)) {
@ -7947,7 +7969,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
@Override
public R unloadZero(Long loadId, String waybillNo, Integer enterNun, Long warehouseId, Integer unbindTray, String trayCode, String orderCode, String remark) {
public R unloadZero(Long loadId, String waybillNo, Integer enterNun, Long warehouseId, Integer unbindTray, String trayCode, String orderCode, String remark,String unloadTrayName,String unloadTrayCode) {
log.info("#############unloadZero: 卸车零担");
TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
@ -8022,6 +8044,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
carsLoadScanEntity.setUnloadTime(new Date());
carsLoadScanEntity.setUnloadTrayName(unloadTrayName);
carsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
trunklineCarsUnloadLogService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode,
@ -8363,6 +8387,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
log.warn("###############unloadTray: 配载计划不存在 loadId={}", loadId);
return R.fail(405, "配载计划不存在");
}
BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
if(Objects.isNull(basicdataTrayEntity)){
log.warn("###############unloadTray: 托盘信息不存在 trayCode={}", trayCode);
return R.fail(405, "托盘信息不存在");
}
String palletName = basicdataTrayEntity.getPalletName();
//查询该节点有没有该托盘的信息
List<TrunklineCarsLoadScanEntity> list = trunklineCarsLoadScanService.findUnloadTrayGoodsList(loadId, warehouseId, trayCode);
Set<String> set = new TreeSet<>();
@ -8371,12 +8403,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
String scanCode = carsLoadScanEntity.getScanCode();
if (type == 1) {
//包件
unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车", incomingType);
unloadPackage(loadId, scanCode, warehouseId, 0, "托盘正常卸车", incomingType,palletName,trayCode);
} else if (type == 2) {
String waybillNo = carsLoadScanEntity.getWaybillNo();
Integer num = carsLoadScanEntity.getNum();
String orderCode = carsLoadScanEntity.getOrderCode();
unloadZero(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "托盘零担正常卸车");
unloadZero(loadId, waybillNo, num, warehouseId, 0, trayCode, orderCode, "托盘零担正常卸车",palletName,trayCode);
}
}

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehousePackageTrackLogService.java
Unescape View File

@ -4,6 +4,10 @@ import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R;
import java.util.List;
public interface IWarehousePackageTrackLogService extends BaseService<WarehousePackageTrackLogEntity> {
R finaPackageTrackLogList(String orderPackageCode);
void addBatchLog(List<String> orderPackageCodes, String content, Long warehouseId, String warehouseName, String nickName, Integer workNodeCode);
}

17
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehousePackageTrackLogServiceImpl.java
Unescape View File

@ -11,6 +11,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
@ -28,4 +29,20 @@ public class WarehousePackageTrackLogServiceImpl extends BaseServiceImpl<Warehou
return R.data(list);
}
@Override
public void addBatchLog(List<String> orderPackageCodes, String content, Long warehouseId, String warehouseName, String nickName, Integer workNodeCode) {
List<WarehousePackageTrackLogEntity> list = new ArrayList<>();
orderPackageCodes.forEach(item->{
WarehousePackageTrackLogEntity entity = new WarehousePackageTrackLogEntity();
entity.setOrderPackageCode(item);
entity.setWarehouseId(warehouseId);
entity.setWarehouseName(warehouseName);
entity.setWorkNode(workNodeCode);
entity.setContent(content);
entity.setOperator(nickName);
list.add(entity);
});
saveBatch(list);
}
}

84
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
Unescape View File

@ -42,6 +42,7 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.RedisKeyConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.apiwarehouse.PalletProductTypeConstant;
import org.springblade.common.constant.broadcast.FanoutConstants;
import org.springblade.common.constant.order.OrderFreezeStatusConstant;
@ -136,6 +137,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
private IBasicdataStorageServicesClient basicdataStorageServicesClient;
@Autowired
private ISendFanoutService sendFanoutService;
@Autowired
private IWarehousePackageTrackLogService warehousePackageTrackLogService;
@Override
@ -704,6 +707,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode());
}
}catch (Exception e){
log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
}
@ -937,6 +948,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodeSet)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodeSet),content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode());
}
});
}catch (Exception e){
@ -1272,6 +1291,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 打托，托盘 "+basicdataTrayEntity.getPalletName();
warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodes),content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode());
}
}catch (Exception e){
log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
}
@ -1401,6 +1429,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(finalWarehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(new ArrayList<>(orderPackageCodes),content,finalWarehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode());
}
});
}catch (Exception e){
@ -2644,6 +2680,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode());
}
}catch (Exception e){
log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
}
@ -2800,6 +2845,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode());
}
});
}catch (Exception e){
@ -2959,6 +3013,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodeList)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(finalWarehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 解托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(orderPackageCodeList,content,finalWarehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.UN_SORTING_TRAYS.getCode());
}
});
}else if("4".equals(associationType)){
List<Long> stockListIds = new ArrayList<>();
@ -4838,6 +4900,16 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,wid,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode());
}
}catch (Exception e){
log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
}
@ -4962,6 +5034,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.TRAYTYPE.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodeSet)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(finalWarehouseId);
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 打托，托盘 "+trayName;
warehousePackageTrackLogService.addBatchLog(orderPackageCodeSet,content,finalWarehouseId,warehouseName,AuthUtil.getNickName(), WorkNodeEnums.SORTING_TRAYS.getCode());
}
});
}else if("4".equals(associationType)){
List<Long> stockListIds = new ArrayList<>();
@ -4986,12 +5066,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
sendFanoutService.sendFanoutMsg(fanoutMsg);
}
});
}catch (Exception e){
}

64
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.warehouse.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.basicdata.entity.*;
@ -23,10 +24,12 @@ import com.logpm.warehouse.vo.*;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springblade.common.constant.TenantNum;
import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.broadcast.FanoutConstants;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.model.FanoutMsg;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
@ -61,6 +64,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
private final IBasicdataWarehouseClient warehouseClient;
private final IDistributionStockListInfoClient distributionStockListInfoClient;
private final ISendFanoutService sendFanoutService;
private final IWarehousePackageTrackLogService warehousePackageTrackLogService;
@Override
public boolean packageChangeStock(List<String> orderPackageCodes) {
@ -1035,6 +1039,13 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.ALLOCATION.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(orderPackageCodes)){
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 上架，库位 "+qrCode;
warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.PUTAWAY.getCode());
}
});
}catch (Exception e){
@ -1688,6 +1699,17 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
sendFanoutService.sendFanoutMsg(fanoutMsg);
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String warehouseName = warehouseEntity.getName();
updownGoodsLogEntities.forEach(warehouseUpdownGoodsLogEntity -> {
String allocationTitle = warehouseUpdownGoodsLogEntity.getAllocationTitle();
String content = "包件在 "+warehouseName+" 下架，库位 "+allocationTitle;
List<String> packageCodeList = new ArrayList<>();
packageCodeList.add(warehouseUpdownGoodsLogEntity.getAssociationValue());
warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
});
});
@ -1898,6 +1920,13 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
@Override
public R downPackageOrDelTray(List<UpShelfPackageDTO> upShelfPackageList, Long warehouseId, String remark) {
int num = 0;
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
if(Objects.isNull(warehouseEntity)){
log.warn("#############downPackageOrDelTray: 仓库信息不存在 warehouseId={}",warehouseId);
return R.fail(405,"仓库信息不存在");
}
String warehouseName = warehouseEntity.getName();
Set<String> orderSet = new TreeSet<>();
List<String> orderPackageCodes = new ArrayList<>();
for (UpShelfPackageDTO upShelfPackageDTO : upShelfPackageList) {
@ -1953,6 +1982,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
// updatePackageGroundingStatus(orderPackageCode, "10", warehouseId);
updateUpdownTypeNum(updownTypeEntity);
String allocationTitle = updownTypeEntity.getAllocationTitle();
String content = "包件在 "+warehouseName+" 下架，库位 "+allocationTitle;
List<String> packageCodeList = new ArrayList<>();
packageCodeList.add(parcelListEntity.getOrderPackageCode());
warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
orderSet.add(orderCode);
num = num + quantity;
orderPackageCodes.add(orderPackageCode);
@ -2100,6 +2135,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.ALLOCATION.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
String allocationTitle = updownTypeEntity.getAllocationTitle();
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String content = "包件在 "+warehouseEntity.getName()+" 下架，库位 "+allocationTitle;
List<String> packageCodeList = new ArrayList<>();
packageCodeList.add(parcelListEntity.getOrderPackageCode());
warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseEntity.getName(), AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
}catch (Exception e){
log.warn("###########saveTrayTypeByOrderPackageCode: 发送打托广播失败");
}
@ -2476,6 +2521,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.ALLOCATION.EXCHANGE).msg(jsonObject.toJSONString()).build();
sendFanoutService.sendFanoutMsg(fanoutMsg);
String allocationTitle = goodsAllocationEntity.getQrCode();
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String content = "包件在 "+warehouseEntity.getName()+" 下架，库位 "+allocationTitle;
warehousePackageTrackLogService.addBatchLog(orderPackageCodes,content,warehouseId,warehouseEntity.getName(), AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
});
}else if("4".equals(associationType)){
List<Long> stockListIds = new ArrayList<>();
@ -3215,6 +3268,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(associationValues)){
String warehouseName = warehouseEntity.getName();
String content = "包件在 "+warehouseName+" 上架，库位 "+qrCode;
warehousePackageTrackLogService.addBatchLog(associationValues,content,wid,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.PUTAWAY.getCode());
}
});
}else if ("4".equals(associationType)){
List<Long> stockListIds = new ArrayList<>();
@ -3556,6 +3615,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
sendFanoutService.sendFanoutMsg(fanoutMsg);
if(CollUtil.isNotEmpty(associationValues)){
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
String content = "包件在 "+warehouseEntity.getName()+" 上架，库位 "+qrCode;
warehousePackageTrackLogService.addBatchLog(associationValues,content,warehouseId,warehouseEntity.getName(), AuthUtil.getNickName(), WorkNodeEnums.PUTAWAY.getCode());
}
});
}else if ("4".equals(associationType)){
List<Long> stockListIds = new ArrayList<>();

Write Preview
Loading…
Cancel
Save