@ -1,5 +1,6 @@
package com.logpm.trunkline.service.impl ;
import cn.hutool.core.collection.CollUtil ;
import cn.hutool.core.util.ObjectUtil ;
import com.alibaba.excel.EasyExcel ;
import com.alibaba.fastjson.JSON ;
@ -89,6 +90,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
private final ITrunklineWaybillReturnService trunklineWaybillReturnService ;
private final IBasicdataOpenIncomingClient basicdataOpenIncomingClient ;
private final ITrunklineCarsLoadService carsLoadService ;
private final ITrunklineCarsLoadScanService trunklineCarsLoadScanService ;
private final IBasicdataStoreContactClient basicdataStoreContactClient ;
private final IAsyncService asyncService ;
@ -383,6 +385,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity . setTotalWeight ( openOrderDTO . getTotalWeghit ( ) ) ;
waybillEntity . setDealerCode ( openOrderDTO . getDealerCode ( ) ) ;
waybillEntity . setDealerName ( openOrderDTO . getDealerName ( ) ) ;
waybillEntity . setWaybillStatus ( "0" ) ;
//统计当前订单的在库数
List < Long > advanceIds = openOrderDTO . getAdvanceIds ( ) ;
AdvanceDetailStockNumVO advanceDetailStockNumVO = advanceDetailService . findStockNumByAdvanceIds ( advanceIds ) ;
@ -420,13 +423,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity . setReceipt ( openOrderDTO . getReceipt ( ) ) ;
waybillEntity . setRemark ( openOrderDTO . getRemark ( ) ) ;
waybillEntity . setWaybillType ( openOrderDTO . getWaybillType ( ) ) ;
waybillEntity . setAgent ( AuthUtil . getUser Name ( ) ) ;
waybillEntity . setAgent ( AuthUtil . getNick Name ( ) ) ;
waybillEntity . setAgentId ( AuthUtil . getUserId ( ) ) ;
waybillEntity . setDocumentMakingTime ( CommonUtil . StringToDate ( openOrderDTO . getOpenOrderDate ( ) ) ) ;
waybillEntity . setPickupCompleteOrNot ( openOrderDTO . getPickupCompleteOrNot ( ) ) ;
waybillEntity . setTrunklineCompleteOrNot ( openOrderDTO . getTrunklineCompleteOrNot ( ) ) ;
waybillEntity . setTrunklineVehicleType ( openOrderDTO . getTrunklineVehicleType ( ) ) ;
waybillEntity . setPickupVehicleType ( openOrderDTO . getPickupVehicleType ( ) ) ;
waybillEntity . setAbolishStatus ( 0 ) ;
waybillEntity . setFreezeStatus ( 0 ) ;
Long waybillId = warehouseWaybillClient . addEnntity ( waybillEntity ) ;
if ( ! Objects . isNull ( waybillId ) ) {
@ -567,6 +572,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Boolean aBoolean = basicdataOpenIncomingClient . checkOpenIncoming ( warehouseId , brandId ) ;
if ( Boolean . TRUE . equals ( aBoolean ) ) {
openOrderAsyncService . incomingPackageBatch ( advanceIds , AuthUtil . getUserId ( ) , Func . firstLong ( AuthUtil . getDeptId ( ) ) , AuthUtil . getTenantId ( ) , AuthUtil . getNickName ( ) , IncomingTypeEnum . OPEN_TO_IN . getCode ( ) , warehouseId , warehouseName ) ;
waybillEntity . setStockCount ( waybillEntity . getTotalCount ( ) ) ;
waybillEntity . setWaybillStatus ( "20" ) ;
warehouseWaybillClient . updateEntity ( waybillEntity ) ;
}
//异步存入日志
@ -700,8 +708,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity . setRemark ( openOrderDTO . getRemark ( ) ) ;
waybillEntity . setWaybillType ( openOrderDTO . getWaybillType ( ) ) ;
waybillEntity . setWaybillStatus ( "20" ) ;
waybillEntity . setAgent ( AuthUtil . getUser Name ( ) ) ;
waybillEntity . setAgent ( AuthUtil . getNick Name ( ) ) ;
waybillEntity . setAgentId ( AuthUtil . getUserId ( ) ) ;
waybillEntity . setAbolishStatus ( 0 ) ;
waybillEntity . setFreezeStatus ( 0 ) ;
Long waybillId = warehouseWaybillClient . addEnntity ( waybillEntity ) ;
waybillEntity . setId ( waybillId ) ;
@ -948,7 +958,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
advanceEntity . setOrderCode ( openLabelDTO . getOrderCode ( ) ) ;
advanceEntity . setSiteName ( openLabelDTO . getSiteName ( ) ) ;
advanceEntity . setArea ( openLabelDTO . getArea ( ) ) ;
advanceEntity . setOrderType ( "Label" ) ;
// advanceEntity.setOrderType("Label");
advanceEntity . setBrand ( openLabelDTO . getBrand ( ) ) ;
Integer totalNumber = openLabelDTO . getTotalNumber ( ) ;
advanceEntity . setTotalNum ( totalNumber ) ;
@ -1043,7 +1053,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
List < Long > advanceIds = new ArrayList < > ( ) ;
List < TrunklineAdvanceEntity > detailEntities = advanceService . findListByExistsAndOrderCodeSet ( orderCodeSet ) ;
List < TrunklineAdvanceEntity > detailEntities = new ArrayList < > ( ) ;
//把orderCodeSet分成每2000个元素为一组
List < Set < String > > orderCodeSets = orderCodeSet . parallelStream ( ) . collect ( Collectors . groupingBy ( a - > a . hashCode ( ) % 2000 ) ) . values ( ) . stream ( ) . map ( a - > new HashSet < > ( a ) ) . collect ( Collectors . toList ( ) ) ;
for ( int i = 0 ; i < orderCodeSets . size ( ) ; i + + ) {
Set < String > set1 = orderCodeSets . get ( i ) ;
List < TrunklineAdvanceEntity > entities = advanceService . findListByExistsAndOrderCodeSet ( orderCodeSet ) ;
detailEntities . addAll ( entities ) ;
}
//把detailEntities转化成以orderCode和trainNumber为key的map
detailEntities . forEach ( advanceEntity - > {
String orderCode = advanceEntity . getOrderCode ( ) ;
@ -1053,7 +1071,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
} ) ;
Map < String , List < TrunklineAdvanceEntity > > advanceMap = detailEntities . parallelStream ( ) . collect ( Collectors . groupingBy ( a - > a . getOrderCode ( ) + "&" + a . getTrainNumber ( ) ) ) ;
// Map<String, List<TrunklineAdvanceEntity>> advanceMap = detailEntities.parallelStream().collect(Collectors.groupingBy(a -> a.getOrderCode() + "&" + a.getTrainNumber()));
listMap . keySet ( ) . forEach ( str - > {
String [ ] split = str . split ( "&" ) ;
@ -1071,12 +1089,24 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
advanceEntity . setWarehouseName ( warehouseName ) ;
advanceEntity . setOrderCode ( orderCode ) ;
advanceEntity . setArea ( pacakgeDetailExcelDTO . getArea ( ) ) ;
advanceEntity . setBrand ( pacakgeDetailExcelDTO . getBrand ( ) ) ;
String brand = pacakgeDetailExcelDTO . getBrand ( ) ;
advanceEntity . setBrand ( brand ) ;
advanceEntity . setTotalNum ( excelDTOS . size ( ) ) ;
String firsts = pacakgeDetailExcelDTO . getFirsts ( ) ;
advanceEntity . setPackName ( firsts ) ;
advanceEntity . setDealerCode ( pacakgeDetailExcelDTO . getDealerCode ( ) ) ;
advanceEntity . setDealerName ( pacakgeDetailExcelDTO . getDealerName ( ) ) ;
String dealerName = pacakgeDetailExcelDTO . getDealerName ( ) ;
if ( StringUtil . isBlank ( dealerName ) ) {
if ( StringUtil . equals ( brand , "欧派" ) ) {
//获取orderCode数字第一次出现的前面字符串截取
int firstDigitIndex = findFirstDigitIndex ( orderCode ) ;
if ( firstDigitIndex ! = - 1 ) {
dealerName = orderCode . substring ( 0 , firstDigitIndex ) ;
}
}
}
advanceEntity . setDealerName ( dealerName ) ;
advanceEntity . setConsigneePerson ( pacakgeDetailExcelDTO . getConsigneePerson ( ) ) ;
advanceEntity . setConsigneeMobile ( pacakgeDetailExcelDTO . getConsigneeMobile ( ) ) ;
advanceEntity . setConsigneeAddress ( pacakgeDetailExcelDTO . getConsigneeAddress ( ) ) ;
@ -1231,6 +1261,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
return R . data ( advanceEntityList ) ;
}
public int findFirstDigitIndex ( String str ) {
for ( int i = 0 ; i < str . length ( ) ; i + + ) {
char c = str . charAt ( i ) ;
if ( Character . isDigit ( c ) ) {
return i ;
}
}
return - 1 ; // 如果没有找到数字，返回-1
}
@Transactional ( rollbackFor = Exception . class )
@Override
public R < List < TrunklineAdvanceEntity > > importCustomizedOuPai ( Long warehouseId , String warehouseName , MultipartFile file ) throws IOException {
@ -1513,8 +1553,21 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
@Override
public R findWaybillDetail ( OpenOrderDTO openOrderDTO ) {
Long waybillId = openOrderDTO . getWaybillId ( ) ;
Integer isEdit = openOrderDTO . getIsEdit ( ) ;
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient . findByWaybillId ( waybillId ) ;
if ( Objects . isNull ( waybillEntity ) ) {
log . warn ( "#############findWaybillDetail: 运单信息不存在 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单信息不存在" ) ;
}
if ( isEdit . equals ( 1 ) ) {
Integer abolishStatus = waybillEntity . getAbolishStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "#############findWaybillDetail: 运单已作废 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单已作废" ) ;
}
}
WarehouseWaybillVO warehouseWaybillVO = new WarehouseWaybillVO ( ) ;
BeanUtil . copy ( waybillEntity , warehouseWaybillVO ) ;
@ -1550,6 +1603,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
log . warn ( "#############updateWaybill: 运单信息不存在 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单信息不存在" ) ;
}
Integer abolishStatus = waybillEntity . getAbolishStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "#############updateWaybill: 运单已作废 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单已作废" ) ;
}
String updateMsg = verifyUpdateData ( openOrderDTO , waybillEntity ) ;
warehouseWaybillClient . updateEntity ( waybillEntity ) ;
@ -1569,6 +1629,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
log . warn ( "#############updateWaybill: 运单信息不存在 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单信息不存在" ) ;
}
Integer abolishStatus = waybillEntity . getAbolishStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "#############updateWaybill: 运单已作废 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单已作废" ) ;
}
// String updateMsg = verifyData(openOrderDTO,waybillEntity);
List < EditOrderMsgVO > list = verifyData ( openOrderDTO , waybillEntity ) ;
@ -1750,6 +1817,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
log . warn ( "##############checkWaybill: 运单信息不存在" ) ;
return R . fail ( 405 , "运单信息不存在" ) ;
}
Integer abolishStatus = warehouseWaybillEntity . getAbolishStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "#############checkWaybill: 运单已作废 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单已作废" ) ;
}
Long checkUserId = warehouseWaybillEntity . getCheckUserId ( ) ;
if ( ! Objects . isNull ( checkUserId ) ) {
log . warn ( "##############checkWaybill: 运单已经审核 waybillId={}" , waybillId ) ;
return R . fail ( 405 , "运单已经审核" ) ;
}
warehouseWaybillEntity . setCheckUserId ( AuthUtil . getUserId ( ) ) ;
warehouseWaybillEntity . setCheckUserName ( AuthUtil . getNickName ( ) ) ;
@ -2252,6 +2330,135 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
return R . data ( pageList ) ;
}
@Override
public R freezeWaybill ( List < Long > waybillIds , Long warehouseId , String warehouseName ) {
List < WarehouseWaybillEntity > waybillEntities = warehouseWaybillClient . findListByWaybillIds ( waybillIds ) ;
waybillEntities . forEach ( waybillEntity - > {
String waybillNo = waybillEntity . getWaybillNo ( ) ;
Integer abolishStatus = waybillEntity . getAbolishStatus ( ) ;
Integer freezeStatus = waybillEntity . getFreezeStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "##############freezeWaybill: {}运单已经作废" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单已经作废,不能冻结" ) ;
}
if ( freezeStatus . equals ( 1 ) ) {
log . warn ( "##############freezeWaybill: {}运单已冻结" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单已冻结,不能冻结" ) ;
}
waybillEntity . setFreezeStatus ( 1 ) ;
waybillEntity . setFreezeTime ( new Date ( ) ) ;
waybillEntity . setFreezeUserName ( AuthUtil . getNickName ( ) ) ;
} ) ;
warehouseWaybillClient . updateList ( waybillEntities ) ;
//修改所有该运单的包件状态为已冻结
distributionParcelListClient . updateFreezeStatusByWaybillIds ( waybillIds ) ;
waybillEntities . forEach ( waybillEntity - > {
String createOperationRemark = "冻结运单" + waybillEntity . getWaybillNo ( ) + ",时间：" + CommonUtil . dateToString ( new Date ( ) ) ;
openOrderAsyncService . saveLog ( waybillEntity . getId ( ) , waybillEntity . getWaybillNo ( ) , "990" , "冻结运单" , createOperationRemark , AuthUtil . getNickName ( ) , AuthUtil . getUserId ( ) , warehouseId , warehouseName ) ;
} ) ;
return R . success ( "修改成功" ) ;
}
@Override
public R unFreezeWaybill ( List < Long > waybillIds , Long warehouseId , String warehouseName ) {
List < WarehouseWaybillEntity > waybillEntities = warehouseWaybillClient . findListByWaybillIds ( waybillIds ) ;
waybillEntities . forEach ( waybillEntity - > {
String waybillNo = waybillEntity . getWaybillNo ( ) ;
Integer abolishStatus = waybillEntity . getAbolishStatus ( ) ;
Integer freezeStatus = waybillEntity . getFreezeStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "##############unFreezeWaybill: {}运单已经作废" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单已经作废,不能解冻" ) ;
}
if ( freezeStatus . equals ( 0 ) ) {
log . warn ( "##############unFreezeWaybill: {}运单未冻结" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单未冻结,不能解冻" ) ;
}
waybillEntity . setFreezeStatus ( 0 ) ;
waybillEntity . setFreezeTime ( null ) ;
waybillEntity . setFreezeUserName ( null ) ;
} ) ;
warehouseWaybillClient . updateWaybillFreezeStatusByWaybillIds ( waybillIds ) ;
//修改所有该运单的包件状态为已冻结
distributionParcelListClient . updateUnFreezeStatusByWaybillIds ( waybillIds ) ;
waybillEntities . forEach ( waybillEntity - > {
String createOperationRemark = "解冻运单" + waybillEntity . getWaybillNo ( ) + ",时间：" + CommonUtil . dateToString ( new Date ( ) ) ;
openOrderAsyncService . saveLog ( waybillEntity . getId ( ) , waybillEntity . getWaybillNo ( ) , "991" , "解冻运单" , createOperationRemark , AuthUtil . getNickName ( ) , AuthUtil . getUserId ( ) , warehouseId , warehouseName ) ;
} ) ;
return R . success ( "修改成功" ) ;
}
@Transactional ( rollbackFor = Exception . class )
@Override
public R abolishWaybill ( List < Long > waybillIds , Long warehouseId , String warehouseName ) {
List < WarehouseWaybillEntity > waybillList = warehouseWaybillClient . findListByWaybillIds ( waybillIds ) ;
List < WarehouseWaybillEntity > waybillEntities = warehouseWaybillClient . findListByWaybillIds ( waybillIds ) ;
waybillList . forEach ( waybillEntity - > {
String waybillNo = waybillEntity . getWaybillNo ( ) ;
String waybillStatus = waybillEntity . getWaybillStatus ( ) ;
if ( StringUtil . isBlank ( waybillStatus ) ) {
log . warn ( "##############abolishWaybill: {}运单为旧数据不能作废" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单为旧数据不能作废" ) ;
}
Integer waybillStatusNum = Integer . parseInt ( waybillStatus ) ;
if ( waybillStatusNum > = 30 ) {
log . warn ( "##############abolishWaybill: {}运单已经进入配载不能进行作废" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单已经进入配载不能进行作废" ) ;
}
Integer abolishStatus = waybillEntity . getAbolishStatus ( ) ;
if ( abolishStatus . equals ( 1 ) ) {
log . warn ( "##############abolishWaybill: {}运单已经作废" , waybillNo ) ;
throw new CustomerException ( 405 , waybillNo + "运单已经作废,不能重复作废" ) ;
}
waybillEntity . setAbolishStatus ( 1 ) ;
waybillEntity . setAbolishUserName ( AuthUtil . getNickName ( ) ) ;
waybillEntity . setAbolishTime ( new Date ( ) ) ;
} ) ;
warehouseWaybillClient . updateList ( waybillEntities ) ;
//把装了车的包件取消装车
List < Long > carsLoadScanIds = trunklineCarsLoadScanService . findCarsLoadScanIdsByWaybillIds ( waybillIds ) ;
if ( ! CollUtil . isEmpty ( carsLoadScanIds ) ) {
//把carsLoadScanIds中的元素用,拼接起来成为一个字符串
String carsLoadScanIdsStr = CollUtil . join ( carsLoadScanIds , "," ) ;
carsLoadService . removeCarsLoadScan ( carsLoadScanIdsStr , warehouseId ) ;
}
List < Long > advanceIds = trunklineWaybillOrderService . findAdvanceIdsByWaybillIds ( waybillIds ) ;
trunklineWaybillOrderService . remove ( new QueryWrapper < TrunklineWaybillOrderEntity > ( ) . in ( "waybill_id" , waybillIds ) ) ;
if ( ! advanceIds . isEmpty ( ) ) {
List < TrunklineAdvanceEntity > advanceEntities = advanceService . findListByIds ( advanceIds ) ;
advanceEntities . forEach ( advanceEntity - > {
advanceEntity . setWaybillStatus ( "0" ) ;
advanceEntity . setWaybillNo ( null ) ;
} ) ;
advanceService . updateBatchById ( advanceEntities ) ;
advanceDetailService . updateWaybillNoIsNullByAdvanceIds ( advanceIds ) ;
distributionParcelListClient . clearParceListWaybillByAdvanceIds ( advanceIds ) ;
}
waybillEntities . forEach ( waybillEntity - > {
String createOperationRemark = "作废运单" + waybillEntity . getWaybillNo ( ) + ",时间：" + CommonUtil . dateToString ( new Date ( ) ) ;
openOrderAsyncService . saveLog ( waybillEntity . getId ( ) , waybillEntity . getWaybillNo ( ) , "1000" , "作废运单" , createOperationRemark , AuthUtil . getNickName ( ) , AuthUtil . getUserId ( ) , warehouseId , warehouseName ) ;
} ) ;
return R . success ( "作废成功" ) ;
}
private List < EditOrderMsgVO > verifyData ( OpenOrderDTO openOrderDTO , WarehouseWaybillEntity waybillEntity ) {
log . info ( "###################verifyData: 验证改单数据" ) ;
StringBuilder stringBuilder = new StringBuilder ( ) ;
@ -2361,7 +2568,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newShipperName = openOrderDTO . getShipperName ( ) ;
String shipperName = waybillEntity . getShipperName ( ) ;
shipperName = StringUtil . isBlank ( shipperName ) ? "" : shipperName ;
if ( ! ObjectUtil . equals ( shipperName , newShipperName ) ) {
// stringBuilder.append("发货人：").append(shipperName).append("-->").append(newShipperName).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
@ -2373,7 +2579,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newShipperMobile = openOrderDTO . getShipperMobile ( ) ;
String shipperMobile = waybillEntity . getShipperMobile ( ) ;
shipperMobile = StringUtil . isBlank ( shipperMobile ) ? "" : shipperMobile ;
if ( ! ObjectUtil . equals ( shipperMobile , newShipperMobile ) ) {
// stringBuilder.append("发货人电话：").append(shipperMobile).append("-->").append(newShipperMobile).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
@ -2385,11 +2590,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newShipperAddress = openOrderDTO . getShipperAddress ( ) ;
String shipperAddress = waybillEntity . getShipperAddress ( ) ;
shipperAddress = StringUtil . isBlank ( shipperAddress ) ? "" : shipperAddress ;
if ( ! ObjectUtil . equals ( shipperAddress , newShipperAddress ) ) {
// stringBuilder.append("发货人地址：").append(shipperAddress).append("-->").append(newShipperAddress).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
editOrderMsgVO . setItemName ( "发货人电话 " ) ;
editOrderMsgVO . setItemName ( "发货人地址 " ) ;
editOrderMsgVO . setOldValue ( shipperAddress ) ;
editOrderMsgVO . setNewValue ( newShipperAddress ) ;
msgList . add ( editOrderMsgVO ) ;
@ -2410,7 +2614,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newConsigneeName = openOrderDTO . getConsigneeName ( ) ;
String consigneeName = waybillEntity . getConsigneeName ( ) ;
consigneeName = StringUtil . isBlank ( consigneeName ) ? "" : consigneeName ;
if ( ! ObjectUtil . equals ( consigneeName , newConsigneeName ) ) {
// stringBuilder.append("收货人：").append(consigneeName).append("-->").append(newConsigneeName).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
@ -2422,7 +2625,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newConsigneeMobile = openOrderDTO . getConsigneeMobile ( ) ;
String consigneeMobile = waybillEntity . getConsigneeMobile ( ) ;
consigneeMobile = StringUtil . isBlank ( consigneeMobile ) ? "" : consigneeMobile ;
if ( ! ObjectUtil . equals ( consigneeMobile , newConsigneeMobile ) ) {
// stringBuilder.append("收货人电话：").append(consigneeMobile).append("-->").append(newConsigneeMobile).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
@ -2434,13 +2636,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newConsigneeAddress = openOrderDTO . getConsigneeAddress ( ) ;
String consigneeAddress = waybillEntity . getConsigneeAddress ( ) ;
consigneeAddress = StringUtil . isBlank ( consigneeAddress ) ? "" : consigneeAddress ;
if ( ! ObjectUtil . equals ( shipperAddress , newShipperAddress ) ) {
// stringBuilder.append("发货人地址：").append(consigneeAddress).append("-->").append(newConsigneeAddress).append(";");
if ( ! ObjectUtil . equals ( consigneeAddress , newConsigneeAddress ) ) {
// stringBuilder.append("收货人地址：").append(consigneeAddress).append("-->").append(newConsigneeAddress).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
editOrderMsgVO . setItemName ( "发 货人地址" ) ;
editOrderMsgVO . setOldValue ( shipper Address) ;
editOrderMsgVO . setNewValue ( newShipper Address ) ;
editOrderMsgVO . setItemName ( "收 货人地址" ) ;
editOrderMsgVO . setOldValue ( consignee Address) ;
editOrderMsgVO . setNewValue ( newConsignee Address ) ;
msgList . add ( editOrderMsgVO ) ;
}
@ -2525,6 +2726,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
editOrderMsgVO . setNewValue ( DictBizCache . getValue ( DictBizConstant . OPEN_ORDER_CHARGE_TYPE , newChargeType + "" ) ) ;
msgList . add ( editOrderMsgVO ) ;
}
BigDecimal newSubtotalFreight = waybillDetailDTO . getSubtotalFreight ( ) ;
BigDecimal subtotalFreight = warehouseWayBillDetail . getSubtotalFreight ( ) ;
if ( subtotalFreight . compareTo ( newSubtotalFreight ) ! = 0 ) {
// stringBuilder.append("明细更新：").append(warehouseWayBillDetail.getProductName()).append(" 单价修改").append(price).append("-->").append(newPrice).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO ( ) ;
editOrderMsgVO . setItemName ( "明细更新 " + warehouseWayBillDetail . getProductName ( ) + " 运费小计修改 " ) ;
editOrderMsgVO . setOldValue ( subtotalFreight . toPlainString ( ) ) ;
editOrderMsgVO . setNewValue ( newSubtotalFreight . toPlainString ( ) ) ;
msgList . add ( editOrderMsgVO ) ;
}
}
}
@ -2863,7 +3076,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newDestination = openOrderDTO . getDestination ( ) ;
String destination = waybillEntity . getDestination ( ) ;
if ( ! destination . equals ( newDestination ) ) {
if ( ! ObjectUtil . equals ( destination , newDestination ) ) {
stringBuilder . append ( "到站：" ) . append ( destination ) . append ( "-->" ) . append ( newDestination ) . append ( ";" ) ;
waybillEntity . setDestination ( newDestination ) ;
waybillEntity . setDestinationCode ( openOrderDTO . getDestinationCode ( ) ) ;
@ -2872,7 +3085,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newDestinationWarehouseName = openOrderDTO . getDestinationWarehouseName ( ) ;
Long destinationWarehouseId = waybillEntity . getDestinationWarehouseId ( ) ;
String departureWarehouseName = waybillEntity . getDepartureWarehouseName ( ) ;
if ( ! destinationWarehouseId . equals ( newDestinationWarehouseId ) ) {
if ( ! ObjectUtil . equals ( destinationWarehouseId , newDestinationWarehouseId ) ) {
stringBuilder . append ( "目的仓：" ) . append ( departureWarehouseName ) . append ( "-->" ) . append ( newDestinationWarehouseName ) . append ( ";" ) ;
waybillEntity . setDestinationWarehouseId ( newDestinationWarehouseId ) ;
waybillEntity . setDestinationWarehouseName ( newDestinationWarehouseName ) ;
@ -2881,31 +3094,28 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newShipper = openOrderDTO . getShipper ( ) ;
Long shipperId = waybillEntity . getShipperId ( ) ;
String shipper = waybillEntity . getShipper ( ) ;
if ( ! shipperId . equals ( newShipperId ) ) {
if ( ! ObjectUtil . equals ( shipperId , newShipperId ) ) {
stringBuilder . append ( "发货单位：" ) . append ( shipper ) . append ( "-->" ) . append ( newShipper ) . append ( ";" ) ;
waybillEntity . setShipper ( newShipper ) ;
waybillEntity . setShipperId ( newShipperId ) ;
}
String newShipperName = openOrderDTO . getShipperName ( ) ;
String shipperName = waybillEntity . getShipperName ( ) ;
shipperName = StringUtil . isBlank ( shipperName ) ? "" : shipperName ;
if ( ! shipperName . equals ( newShipperName ) ) {
if ( ! ObjectUtil . equals ( shipperName , newShipperName ) ) {
stringBuilder . append ( "发货人：" ) . append ( shipperName ) . append ( "-->" ) . append ( newShipperName ) . append ( ";" ) ;
waybillEntity . setShipperName ( newShipperName ) ;
}
String newShipperMobile = openOrderDTO . getShipperMobile ( ) ;
String shipperMobile = waybillEntity . getShipperMobile ( ) ;
shipperMobile = StringUtil . isBlank ( shipperMobile ) ? "" : shipperMobile ;
if ( ! shipperMobile . equals ( newShipperMobile ) ) {
if ( ! ObjectUtil . equals ( shipperMobile , newShipperMobile ) ) {
stringBuilder . append ( "发货人电话：" ) . append ( shipperMobile ) . append ( "-->" ) . append ( newShipperMobile ) . append ( ";" ) ;
waybillEntity . setShipperMobile ( newShipperMobile ) ;
}
String newShipperAddress = openOrderDTO . getShipperAddress ( ) ;
String shipperAddress = waybillEntity . getShipperAddress ( ) ;
shipperAddress = StringUtil . isBlank ( shipperAddress ) ? "" : shipperAddress ;
if ( ! shipperAddress . equals ( newShipperAddress ) ) {
if ( ! ObjectUtil . equals ( shipperAddress , newShipperAddress ) ) {
stringBuilder . append ( "发货人地址：" ) . append ( shipperAddress ) . append ( "-->" ) . append ( newShipperAddress ) . append ( ";" ) ;
waybillEntity . setShipperAddress ( newShipperAddress ) ;
}
@ -2914,7 +3124,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newConsignee = openOrderDTO . getConsignee ( ) ;
Long consigneeId = waybillEntity . getConsigneeId ( ) ;
String consignee = waybillEntity . getConsignee ( ) ;
if ( ! consigneeId . equals ( newConsigneeId ) ) {
if ( ! ObjectUtil . equals ( consigneeId , newConsigneeId ) ) {
stringBuilder . append ( "收货单位：" ) . append ( consignee ) . append ( "-->" ) . append ( newConsignee ) . append ( ";" ) ;
waybillEntity . setConsignee ( newConsignee ) ;
waybillEntity . setConsigneeId ( newConsigneeId ) ;
@ -2922,24 +3132,21 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newConsigneeName = openOrderDTO . getConsigneeName ( ) ;
String consigneeName = waybillEntity . getConsigneeName ( ) ;
consigneeName = StringUtil . isBlank ( consigneeName ) ? "" : consigneeName ;
if ( ! consigneeName . equals ( newConsigneeName ) ) {
if ( ! ObjectUtil . equals ( consigneeName , newConsigneeName ) ) {
stringBuilder . append ( "收货人：" ) . append ( consigneeName ) . append ( "-->" ) . append ( newConsigneeName ) . append ( ";" ) ;
waybillEntity . setConsigneeName ( newConsigneeName ) ;
}
String newConsigneeMobile = openOrderDTO . getConsigneeMobile ( ) ;
String consigneeMobile = waybillEntity . getConsigneeMobile ( ) ;
consigneeMobile = StringUtil . isBlank ( consigneeMobile ) ? "" : consigneeMobile ;
if ( ! consigneeMobile . equals ( newConsigneeMobile ) ) {
if ( ! ObjectUtil . equals ( consigneeMobile , newConsigneeName ) ) {
stringBuilder . append ( "收货人电话：" ) . append ( consigneeMobile ) . append ( "-->" ) . append ( newConsigneeMobile ) . append ( ";" ) ;
waybillEntity . setConsigneeMobile ( newConsigneeMobile ) ;
}
String newConsigneeAddress = openOrderDTO . getConsigneeAddress ( ) ;
String consigneeAddress = waybillEntity . getConsigneeAddress ( ) ;
consigneeAddress = StringUtil . isBlank ( consigneeAddress ) ? "" : consigneeAddress ;
if ( ! shipperAddress . equals ( newShipperAddress ) ) {
if ( ! ObjectUtil . equals ( consigneeAddress , newConsigneeAddress ) ) {
stringBuilder . append ( "收货人地址：" ) . append ( consigneeAddress ) . append ( "-->" ) . append ( newConsigneeAddress ) . append ( ";" ) ;
waybillEntity . setConsigneeAddress ( newConsigneeAddress ) ;
}
@ -2999,7 +3206,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
}
Integer newNum = waybillDetailDTO . getNum ( ) ;
Integer num = warehouseWayBillDetail . getNum ( ) ;
if ( ! num . equals ( newNum ) ) {
if ( ! ObjectUtil . equals ( num , newNum ) ) {
stringBuilder . append ( "明细更新：" ) . append ( warehouseWayBillDetail . getProductName ( ) ) . append ( " 数量修改" ) . append ( num ) . append ( "-->" ) . append ( newNum ) . append ( ";" ) ;
warehouseWayBillDetail . setNum ( newNum ) ;
}
@ -3013,17 +3220,25 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Integer newChargeType = waybillDetailDTO . getChargeType ( ) ;
Integer chargeType = warehouseWayBillDetail . getChargeType ( ) ;
if ( ! chargeType . equals ( newChargeType ) ) {
if ( ! ObjectUtil . equals ( chargeType , newChargeType ) ) {
stringBuilder . append ( "明细更新：" ) . append ( warehouseWayBillDetail . getProductName ( ) ) . append ( " 计价方式修改" ) . append ( chargeType ) . append ( "-->" ) . append ( newChargeType ) . append ( ";" ) ;
warehouseWayBillDetail . setChargeType ( newChargeType ) ;
}
BigDecimal newSubtotalFreight = waybillDetailDTO . getSubtotalFreight ( ) ;
BigDecimal subtotalFreight = warehouseWayBillDetail . getSubtotalFreight ( ) ;
if ( subtotalFreight . compareTo ( newSubtotalFreight ) ! = 0 ) {
stringBuilder . append ( "明细更新：" ) . append ( warehouseWayBillDetail . getProductName ( ) ) . append ( " 运费小计修改" ) . append ( subtotalFreight ) . append ( "-->" ) . append ( newSubtotalFreight ) . append ( ";" ) ;
warehouseWayBillDetail . setSubtotalFreight ( newSubtotalFreight ) ;
}
warehouseWaybillDetailClient . updateEntityById ( warehouseWayBillDetail ) ;
}
}
Integer newTotalCount = openOrderDTO . getTotalCount ( ) ;
Integer totalCount = waybillEntity . getTotalCount ( ) ;
if ( ! totalCount . equals ( newTotalCount ) ) {
if ( ! ObjectUtil . equals ( totalCount , newTotalCount ) ) {
stringBuilder . append ( "货物总数：" ) . append ( totalCount ) . append ( "-->" ) . append ( newTotalCount ) . append ( ";" ) ;
waybillEntity . setTotalCount ( newTotalCount ) ;
}
@ -3100,14 +3315,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newPayType = openOrderDTO . getPayType ( ) ;
String payType = waybillEntity . getPayType ( ) ;
if ( ! payType . equals ( newPayType ) ) {
if ( ! ObjectUtil . equals ( payType , newPayType ) ) {
stringBuilder . append ( "支付方式：" ) . append ( payType ) . append ( "-->" ) . append ( newPayType ) . append ( ";" ) ;
waybillEntity . setPayType ( newPayType ) ;
}
String newPayWay = openOrderDTO . getPayWay ( ) ;
String payWay = waybillEntity . getPayWay ( ) ;
if ( ! payWay . equals ( newPayWay ) ) {
if ( ! ObjectUtil . equals ( payType , newPayType ) ) {
stringBuilder . append ( "付款方式：" ) . append ( payWay ) . append ( "-->" ) . append ( newPayWay ) . append ( ";" ) ;
waybillEntity . setPayWay ( newPayWay ) ;
}
@ -3149,14 +3364,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
String newdeliveryWay = openOrderDTO . getDeliveryWay ( ) ;
String deliveryWay = waybillEntity . getDeliveryWay ( ) ;
if ( ! deliveryWay . equals ( newdeliveryWay ) ) {
if ( ! ObjectUtil . equals ( deliveryWay , newdeliveryWay ) ) {
stringBuilder . append ( "送货方式：" ) . append ( deliveryWay ) . append ( "-->" ) . append ( newdeliveryWay ) . append ( ";" ) ;
waybillEntity . setDeliveryWay ( newdeliveryWay ) ;
}
String newurgency = openOrderDTO . getUrgency ( ) ;
String urgency = waybillEntity . getUrgency ( ) ;
if ( ! urgency . equals ( newurgency ) ) {
if ( ! ObjectUtil . equals ( urgency , newurgency ) ) {
stringBuilder . append ( "紧急度：" ) . append ( urgency ) . append ( "-->" ) . append ( newurgency ) . append ( ";" ) ;
waybillEntity . setUrgency ( newurgency ) ;
}
zhaoqiaobo
11 months ago