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

Merge branch 'dev' into pre-production

master
pref_mail@163.com 10 months ago
parent
933771d85e 66368e514e
commit
949dec8424
2 changed files with 105 additions and 125 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. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
  2. 228
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
Unescape View File

@ -198,5 +198,5 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
void updateCustomerAllByOrderCode(@Param("data") cn.hutool.json.JSONObject data);
void updateDistributionStockArticleEntityById(@Param("t")DistributionStockArticleEntity t);
void updateDistributionStockArticleEntityById(@Param("t") DistributionStockArticleEntity t);
}

228
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
Unescape View File

@ -168,11 +168,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
if (ObjectUtils.isNull(myCurrentWarehouse)) {
//查询当前用户的仓库列表
List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
if (!warehouseList.isEmpty()){
if (!warehouseList.isEmpty()) {
List<Long> warehouseListIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
paramMap.put("warehouseIds", warehouseListIds);
}
}else {
} else {
paramMap.put("warehouseId", myCurrentWarehouse.getId());
}
// 用户勾选数据的ids
@ -1375,8 +1375,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
public void updateOrderInfoByDistributionStockArticleEntity(DistributionStockArticleEntity stockArticleEntity){
public void updateOrderInfoByDistributionStockArticleEntity(DistributionStockArticleEntity stockArticleEntity) {
if (Objects.isNull(stockArticleEntity)) {
log.warn("##############updateOrderInfoByDistributionStockArticleEntity: 订单信息不存在 orderCode={} warehouseId={}", stockArticleEntity.getOrderCode(), stockArticleEntity.getWarehouseId());
@ -1558,9 +1557,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
public void updateOrdersInfo(List<String> orderCodes, Long warehouseId) {
log.info(">>>>> T updateOrdersInfo start");
log.info(">>>>> updateOrdersInfo orderCodes :{},warehouseId:{}",orderCodes,warehouseId);
if(orderCodes.isEmpty()){
return ;
log.info(">>>>> updateOrdersInfo orderCodes :{},warehouseId:{}", orderCodes, warehouseId);
if (orderCodes.isEmpty()) {
return;
}
QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
@ -1572,8 +1571,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
List<DistributionStockArticleEntity> distributionStockArticleEntities = baseMapper.selectList(queryWrapper);
for (DistributionStockArticleEntity stockArticleEntity : distributionStockArticleEntities) {
if (Objects.isNull(stockArticleEntity)) {
@ -1593,20 +1590,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
}
private void updateStockArticleByextracted(Long warehouseId, DistributionStockArticleEntity stockArticleEntity) {
Integer totalNumber = stockArticleEntity.getTotalNumber();
boolean isChange =false;
boolean isChange = false;
QueryWrapper<DistributionParcelListEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("order_code", stockArticleEntity.getOrderCode())
.eq("warehouse_id", warehouseId)
@ -1685,194 +1673,193 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
}
if(!orderWaybillNo.equals(stockArticleEntity.getWaybillNumber())){
if (!orderWaybillNo.equals(stockArticleEntity.getWaybillNumber())) {
stockArticleEntity.setWaybillNumber(orderWaybillNo);
isChange =true;
isChange = true;
}
if(stockArticleEntity.getWarehouseEntryTime().getTime()!=firstEntryTime){
if (stockArticleEntity.getWarehouseEntryTime().getTime() != firstEntryTime) {
stockArticleEntity.setWarehouseEntryTime(new Date(firstEntryTime));
isChange =true;
isChange = true;
}
if(stockArticleEntity.getWarehouseEntryTimeEnd().getTime()!=lastEntryTime){
if (stockArticleEntity.getWarehouseEntryTimeEnd().getTime() != lastEntryTime) {
stockArticleEntity.setWarehouseEntryTimeEnd(new Date(lastEntryTime));
isChange =true;
isChange = true;
}
if(incomingNum == 0){
if (incomingNum == 0) {
if(!"10".equals(stockArticleEntity.getOrderReceiveStatus())){
if (!"10".equals(stockArticleEntity.getOrderReceiveStatus())) {
stockArticleEntity.setOrderReceiveStatus("10");
isChange =true;
isChange = true;
}
if(1!= stockArticleEntity.getCompleteSet()){
if (1 != stockArticleEntity.getCompleteSet()) {
stockArticleEntity.setCompleteSet(1);
isChange =true;
isChange = true;
}
if(!"0".equals(stockArticleEntity.getOrderStatus())){
if (!"0".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("0");
isChange =true;
isChange = true;
}
} else if (0 < incomingNum && incomingNum < totalNumber) {
if(!"20".equals(stockArticleEntity.getOrderReceiveStatus())){
if (!"20".equals(stockArticleEntity.getOrderReceiveStatus())) {
stockArticleEntity.setOrderReceiveStatus("20");
isChange =true;
isChange = true;
}
if(1!= stockArticleEntity.getCompleteSet()){
if (1 != stockArticleEntity.getCompleteSet()) {
stockArticleEntity.setCompleteSet(1);
isChange =true;
isChange = true;
}
if(!"10".equals(stockArticleEntity.getOrderStatus())){
if (!"10".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("10");
isChange =true;
isChange = true;
}
if (reservationNum == 0) {
if(!"10".equals(stockArticleEntity.getReservationStatus())){
if (!"10".equals(stockArticleEntity.getReservationStatus())) {
stockArticleEntity.setReservationStatus("10");
isChange =true;
isChange = true;
}
} else {
if(!"20".equals(stockArticleEntity.getReservationStatus())){
if (!"20".equals(stockArticleEntity.getReservationStatus())) {
stockArticleEntity.setReservationStatus("20");
isChange =true;
isChange = true;
}
}
if (groundingNum == 0) {
if(!"10".equals(stockArticleEntity.getGroundingStatus())){
if (!"10".equals(stockArticleEntity.getGroundingStatus())) {
stockArticleEntity.setGroundingStatus("10");
isChange =true;
isChange = true;
}
} else {
if(!"20".equals(stockArticleEntity.getGroundingStatus())){
if (!"20".equals(stockArticleEntity.getGroundingStatus())) {
stockArticleEntity.setGroundingStatus("20");
isChange =true;
isChange = true;
}
}
if(signNum == 0){
if(outNum == 0){
if(!"10".equals(stockArticleEntity.getOrderStatus())){
if (signNum == 0) {
if (outNum == 0) {
if (!"10".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("10");
isChange =true;
isChange = true;
}
}else{
if(!"30".equals(stockArticleEntity.getOrderStatus())){
} else {
if (!"30".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("30");
isChange =true;
isChange = true;
}
}
}else{
if(!"70".equals(stockArticleEntity.getOrderStatus())){
} else {
if (!"70".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("70");
isChange =true;
isChange = true;
}
}
}else{
} else {
if(!"30".equals(stockArticleEntity.getOrderReceiveStatus())){
if (!"30".equals(stockArticleEntity.getOrderReceiveStatus())) {
stockArticleEntity.setOrderReceiveStatus("30");
isChange =true;
isChange = true;
}
if(2!= stockArticleEntity.getCompleteSet()){
if (2 != stockArticleEntity.getCompleteSet()) {
stockArticleEntity.setCompleteSet(2);
isChange =true;
isChange = true;
}
if(!"20".equals(stockArticleEntity.getOrderStatus())){
if (!"20".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("20");
isChange =true;
isChange = true;
}
if (reservationNum.equals(0)) {
if(!"10".equals(stockArticleEntity.getReservationStatus())){
if (!"10".equals(stockArticleEntity.getReservationStatus())) {
stockArticleEntity.setReservationStatus("10");
isChange =true;
isChange = true;
}
} else if (reservationNum > 0 && reservationNum < totalNumber) {
if(!"20".equals(stockArticleEntity.getReservationStatus())){
if (!"20".equals(stockArticleEntity.getReservationStatus())) {
stockArticleEntity.setReservationStatus("20");
isChange =true;
isChange = true;
}
} else {
if(!"30".equals(stockArticleEntity.getReservationStatus())){
if (!"30".equals(stockArticleEntity.getReservationStatus())) {
stockArticleEntity.setReservationStatus("30");
isChange =true;
isChange = true;
}
}
if (groundingNum.equals(0)) {
if(!"10".equals(stockArticleEntity.getGroundingStatus())){
if (!"10".equals(stockArticleEntity.getGroundingStatus())) {
stockArticleEntity.setGroundingStatus("10");
isChange =true;
isChange = true;
}
} else if (groundingNum > 0 && groundingNum < totalNumber) {
if(!"20".equals(stockArticleEntity.getGroundingStatus())){
if (!"20".equals(stockArticleEntity.getGroundingStatus())) {
stockArticleEntity.setGroundingStatus("20");
isChange =true;
isChange = true;
}
} else {
if(!"30".equals(stockArticleEntity.getGroundingStatus())){
if (!"30".equals(stockArticleEntity.getGroundingStatus())) {
stockArticleEntity.setGroundingStatus("30");
isChange =true;
isChange = true;
}
}
if(signNum.equals(0)){
if(outNum.equals(0)){
if(!"20".equals(stockArticleEntity.getOrderStatus())){
if (signNum.equals(0)) {
if (outNum.equals(0)) {
if (!"20".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("20");
isChange =true;
isChange = true;
}
}else{
if(outNum.equals(totalNumber)){
if(!"40".equals(stockArticleEntity.getOrderStatus())){
} else {
if (outNum.equals(totalNumber)) {
if (!"40".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("40");
isChange =true;
isChange = true;
}
}else{
if(!"30".equals(stockArticleEntity.getOrderStatus())){
} else {
if (!"30".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("30");
isChange =true;
isChange = true;
}
}
}
}else{
if(signNum.equals(totalNumber)){
if(!"80".equals(stockArticleEntity.getOrderStatus())){
} else {
if (signNum.equals(totalNumber)) {
if (!"80".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("80");
isChange =true;
isChange = true;
}
}else{
if(!"70".equals(stockArticleEntity.getOrderStatus())){
} else {
if (!"70".equals(stockArticleEntity.getOrderStatus())) {
stockArticleEntity.setOrderStatus("70");
isChange =true;
isChange = true;
}
}
}
}
if(!stockArticleEntity.getHandQuantity().equals(handleNum)){
if (!stockArticleEntity.getHandQuantity().equals(handleNum)) {
stockArticleEntity.setHandQuantity(handleNum);
isChange =true;
isChange = true;
}
if(!stockArticleEntity.getIncomingNum().equals(incomingNum)){
if (!stockArticleEntity.getIncomingNum().equals(incomingNum)) {
stockArticleEntity.setIncomingNum(incomingNum);
isChange =true;
isChange = true;
}
if(isChange){
if (isChange) {
updateById(stockArticleEntity);
}
}
@ -1989,17 +1976,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
// 这里在和原始对象进行比较
check2ObjSome(t, stockArticleEntity);
baseMapper.updateDistributionStockArticleEntityById(t);
// 根据跳进进行更新
baseMapper.updateDistributionStockArticleEntityById(t);
// this.updateById(stockArticleEntity);//
}
} else if (IsOrNoConstant.yes.getValue().equals(stockArticleEntity.getIsZero())) {
//零担订单维护
@ -2078,27 +2059,26 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
private void check2ObjSome(DistributionStockArticleEntity t, DistributionStockArticleEntity stockArticleEntity) {
t.setId(stockArticleEntity.getId());
if(t.getOrderStatus().equals(stockArticleEntity.getOrderStatus())){
if (t.getOrderStatus() != null && t.getOrderStatus().equals(stockArticleEntity.getOrderStatus())) {
t.setOrderStatus(null);
}
if(t.getReservationStatus().equals(stockArticleEntity.getReservationStatus())){
if (t.getReservationStatus() != null && t.getReservationStatus().equals(stockArticleEntity.getReservationStatus())) {
t.setReservationStatus(null);
}
if(t.getGenre().equals(stockArticleEntity.getGenre())){
if (t.getGenre() != null && t.getGenre().equals(stockArticleEntity.getGenre())) {
t.setGenre(null);
}
if(t.getHandQuantity().equals(stockArticleEntity.getHandQuantity())){
if (t.getHandQuantity() != null && t.getHandQuantity().equals(stockArticleEntity.getHandQuantity())) {
t.setHandQuantity(null);
}
if(t.getDeliveryQuantity().equals(stockArticleEntity.getDeliveryQuantity())){
if (t.getDeliveryQuantity() != null && t.getDeliveryQuantity().equals(stockArticleEntity.getDeliveryQuantity())) {
t.setDeliveryQuantity(null);
}
if(t.getSigninQuantity().equals(stockArticleEntity.getSigninQuantity())){
if (t.getSigninQuantity() != null && t.getSigninQuantity().equals(stockArticleEntity.getSigninQuantity())) {
t.setSigninQuantity(null);
}
}
@Override
@ -2202,7 +2182,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
} else if (IsOrNoConstant.yes.getValue().equals(stockArticleEntity.getIsZero())) {
//零担订单维护
List<DistributionParcelNumberEntity> parcelNumberEntities = distributionParcelNumberMapper.selectList(Wrappers.<DistributionParcelNumberEntity>query().lambda()
.eq(DistributionParcelNumberEntity::getStockArticleId,s)
.eq(DistributionParcelNumberEntity::getStockArticleId, s)
);
//在库数量
int inWarehouseQuantity = 0;
@ -2581,12 +2561,12 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
R<User> userR = userClient.userInfoById(a.getCreateUser());
a.setCreateUserName(userR.getData().getName());
}
if (!Func.isEmpty(a.getReservationIds())){
if (!Func.isEmpty(a.getReservationIds())) {
//构建签收信息
List<Map<String,Object>> mapList = distributionSignforMapper.getByReservationIds(Func.toLongList(a.getReservationIds()));
if (!mapList.isEmpty()){
a.setInfo(mapList);
}
List<Map<String, Object>> mapList = distributionSignforMapper.getByReservationIds(Func.toLongList(a.getReservationIds()));
if (!mapList.isEmpty()) {
a.setInfo(mapList);
}
}
});
@ -2705,17 +2685,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
boolean flag = this.updateBatchById(list);
log.info(">>>>>>>>>>>>>>>>>>>维护订单商场信息,:{}",flag);
log.info(">>>>>>>>>>>>>>>>>>>维护订单商场信息,:{}", flag);
return null;
}
@Override
public void updateCustomerAllByOrderCode(String data) {
@Override
public void updateCustomerAllByOrderCode(String data) {
log.info("欧派工厂推送数据更新订单客户信息：{}", data);
this.baseMapper.updateCustomerAllByOrderCode(JSONUtil.parseObj(data));
}
}
@Override
@Override
public R findEditCustomerLog(Long orderId) {
QueryWrapper<DistributionOrderCustomerLogEntity> queryWrapper = new QueryWrapper<>();

Write Preview
Loading…
Cancel
Save