|
|
|
@ -3379,16 +3379,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
|
|
|
|
|
if(2 == signState){ |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); |
|
|
|
|
}else{ |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue()); |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); |
|
|
|
|
if(!Objects.isNull(waybillEntity)){ |
|
|
|
|
String warehouseName = waybillEntity.getWarehouseName();//目的仓
|
|
|
|
|
BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); |
|
|
|
|
Long endWarehouseId = endhouse.getId(); |
|
|
|
|
Long warehouseId = distributionStockArticleEntity.getWarehouseId(); |
|
|
|
|
if(endWarehouseId.equals(warehouseId)){ |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); |
|
|
|
|
// entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
|
|
|
|
|
entity.setIsTransfer(0); |
|
|
|
|
}else{ |
|
|
|
|
entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue()); |
|
|
|
|
// entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
|
|
|
|
|
entity.setIsTransfer(1); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|