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

fix:修复问题？

dist.1.2.0
pref_mail@163.com 5 months ago
parent
48e094fd36
commit
c68bace53b
9 changed files with 73 additions and 50 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-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java
  2. 4
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java
  3. 1
      blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
  4. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.xml
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  6. 43
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  7. 36
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java
  8. 33
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
  9. 1
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java
Unescape View File

@ -21,7 +21,7 @@ public class MockLoginService {
HttpRequest urlRequest = HttpRequest.post(url);
// urlRequest.header("Authorization", "Basic c2FiZXI6c2FiZXJfc2VjcmV0");
urlRequest.header("Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0");
urlRequest.header("Tenant-Id", "627683");
urlRequest.header("Tenant-Id", tenantId);
Map<String, Object> params = new HashMap<>();
params.put("grant_type", "local_server");

4
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java
Unescape View File

@ -67,6 +67,10 @@ public class TaskQuestEntity extends TenantEntity {
*/
@ApiModelProperty(value = "任务单号")
private String questNum;
@ApiModelProperty(value = "盘点任务名称")
private String taskName;
/**
* 开始时间
*/

1
blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
Unescape View File

@ -377,6 +377,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
byOrderSelfNumAndTenantId.setDeliveryQuantity(0);
byOrderSelfNumAndTenantId.setStoreTime(null);
byOrderSelfNumAndTenantId.setWaybillId(null);
byOrderSelfNumAndTenantId.setTypeService("2");
// 对应新增的订单默认在库件数未0
byOrderSelfNumAndTenantId.setHandQuantity(0);
byOrderSelfNumAndTenantId.setIncomingNum(0);

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelNumberMapper.xml
Unescape View File

@ -53,7 +53,6 @@
ldpn.delivery_quantity,
ldpn.outbound_quantity,
ldpn.signin_quantity,
ldpn.signin_quantity,
ldpl.stock_article_id,
ldpl.service_number,
ldpl.firsts AS firsts,

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

@ -938,7 +938,7 @@
LEFT JOIN logpm_basicdata_material lbm ON ldsl.material_id = lbm.id
<where>
ldsld.is_deleted = 0
AND ldsld.reservation_id = #{reservationId}
AND ldsld.reservation_id = #{param.reservationId}
AND ldsld.stock_package_status != 2
</where>
</select>

43
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -908,7 +908,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
Integer isStrictLoading = 0;
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
if (warehouseConfig != null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
String[] split = distrilbutionloadingscanDTO.getBarcodes().split(",");
@ -1407,7 +1407,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
Integer isStrictLoading = 0;
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
if (warehouseConfig != null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
//查询订单
@ -3209,7 +3209,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// }
Integer isStrictLoading = 0;
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
if (warehouseConfig != null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
@ -3447,7 +3447,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.data(orderpackages, "签收成功");
} catch (Exception e) {
e.printStackTrace();
LogError logError = new LogError();
logError.setMessage(e.getMessage());
logClient.saveErrorLog(logError);
@ -5373,13 +5373,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
.eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId())
.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
);
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
if (warehouseConfig != null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
Boolean driver = distributionDeliveryListService.judgeIsDriver(user);
DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(distributionDeliveryListEntity, user, driver);
if (distributionDeliveryListEntity.getKind() == "1") {
if (Objects.equals(distributionDeliveryListEntity.getKind(), "1")) {
if (!driver) {
return Resp.scanFail("操作失败", "当前操作由司机操作");
}
@ -6029,7 +6029,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
for (DistributionLoadscanEntity distributionParcelListEntity : distributionLoadscanEntityLists) {
PackageData packageData = new PackageData();
if (1 == distributionParcelListEntity.getIsZero()) {
if ( distributionParcelListEntity.getIsZero()!=null && 1 == distributionParcelListEntity.getIsZero()) {
// 零担
packageData.setPackageType(PackageTypeEnums.LTL);
packageData.setNumber(distributionLoadscanEntity.getReceivedQuantity());
@ -6072,6 +6072,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
distributionLoadVO.setPackageDataList(data);
nodeFanoutMsg.setMain(distributionLoadVO);
nodeFanoutMsg.setTenantId(AuthUtil.getTenantId());
return nodeFanoutMsg;
}
@ -6402,7 +6405,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanAbnormalEntity.getPackageCode())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
);
extractedBuildNewPackage(reservationEntity, distributionLoadscanAbnormalEntity,myCurrentWarehouse);
extractedBuildNewPackage(reservationEntity, distributionLoadscanAbnormalEntity, myCurrentWarehouse);
loadscanEntity.setIsAbnormalLoading(1);
if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
//已经进行签收了 这里就需要将异常签收的状态变更为正常
@ -6454,7 +6457,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
distributionLoadscanService.updateById(loadscanEntity);
//构建新包件信息
extractedBuildNewPackage(reservationEntity, a,myCurrentWarehouse);
extractedBuildNewPackage(reservationEntity, a, myCurrentWarehouse);
});
} else {
return R.fail(3000, "无需审批");
@ -6479,7 +6482,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.success("操作成功");
}
private void extractedBuildNewPackage(DistributionReservationEntity reservationEntity, DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity,BasicdataWarehouseEntity warehouse) {
private void extractedBuildNewPackage(DistributionReservationEntity reservationEntity, DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity, BasicdataWarehouseEntity warehouse) {
DistributionReservationPackageEntity reservationPackageEntity = getDistributionReservationPackageEntity(reservationEntity, distributionLoadscanAbnormalEntity);
distributionReservationPackageService.save(reservationPackageEntity);
//维护包件的预约状态
@ -7722,7 +7725,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date());
Integer isStrictLoading = 0;
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
if (warehouseConfig!=null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
Long deliveryId = distrilbutionloadingscanDTO.getDeliveryId();
@ -7970,8 +7973,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
int a = 0;
outboundQuantity = outboundQuantity - distributionLoadscanEntity.getLoadedNub();
signinQuantity = signinQuantity - distributionLoadscanEntity.getReceivedQuantity();
handQuantity += distributionLoadscanEntity.getLoadedNub();
deliveryQuantity+=distributionLoadscanEntity.getLoadedNub();
handQuantity += distributionLoadscanEntity.getLoadedNub();
deliveryQuantity += distributionLoadscanEntity.getLoadedNub();
if (distributionLoadscanEntity.getLoadedNub() < parcelNumberDTO.getSigningNum()) {
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) {
return Resp.scanFail("装车数量少于签收数,无法签收", "装车数量少于签收数,无法签收");
@ -7992,10 +7995,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setSigningTime(now);
distributionLoadscanEntity.setSigningUser(user.getNickName());
//进行签收数量的统计
outboundQuantity += distributionLoadscanEntity.getLoadedNub();
signinQuantity += distributionLoadscanEntity.getReceivedQuantity();
handQuantity = handQuantity - distributionLoadscanEntity.getLoadedNub();
deliveryQuantity = deliveryQuantity - distributionLoadscanEntity.getLoadedNub();
outboundQuantity += distributionLoadscanEntity.getLoadedNub();
signinQuantity += distributionLoadscanEntity.getReceivedQuantity();
handQuantity = handQuantity - distributionLoadscanEntity.getLoadedNub();
deliveryQuantity = deliveryQuantity - distributionLoadscanEntity.getLoadedNub();
distributionLoadscanService.updateById(distributionLoadscanEntity);
pushList.add(distributionLoadscanEntity);
JSONObject jsonObject = new JSONObject();
@ -8057,8 +8060,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setOneQclick(2);
loadscanEntity.setSigningTime(now);
outboundQuantity += loadscanEntity.getLoadedNub();
deliveryQuantity = deliveryQuantity - loadscanEntity.getLoadedNub() ;
signinQuantity += loadscanEntity.getLoadedNub();
deliveryQuantity = deliveryQuantity - loadscanEntity.getLoadedNub();
signinQuantity += loadscanEntity.getLoadedNub();
handQuantity = handQuantity - loadscanEntity.getLoadedNub();
deliveryQuantity = deliveryQuantity - loadscanEntity.getLoadedNub();
//将装车和签收进行统一数量
@ -8793,7 +8796,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
Integer isStrictLoading = 0;
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(warehouse.getId());
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
if (warehouseConfig != null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
isStrictLoading = warehouseConfig.getIsStrictLoading();
}
//查询签收数据

36
blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java
Unescape View File

@ -17,6 +17,7 @@ import com.logpm.factory.snm.vo.request.RequestSecBaseVo;
import com.logpm.factory.snm.vo.request.RequestVo;
import com.logpm.factory.snm.vo.response.*;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -31,6 +32,7 @@ import java.util.*;
@AllArgsConstructor
@Service
@Slf4j
public class OrderServiceImpl implements IOrderService {
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@ -71,12 +73,10 @@ public class OrderServiceImpl implements IOrderService {
systemSign.setPublicKey(factorySnmdataProperties.getPublicKey());
try {
systemSign.setSign(makeSystemSign(requestLineNumberVo, now));
} catch (NoSuchFieldException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (NoSuchFieldException | IllegalAccessException e) {
log.error(">>>>>>>>>>>>>>", e);
}
requestLineNumberVo.setSystemSign(systemSign);
requestLineNumberVo.setSystemSign(systemSign);
requestVo.setData(requestLineNumberVo);
@ -96,25 +96,15 @@ public class OrderServiceImpl implements IOrderService {
orderLogEntity.setReqArgs(userStr);
orderLogEntity.setType(1);
orderLogEntity.setResBody(JSONUtil.toJsonStr(responseStationOrderVo));
if(responseStationOrderVo.getCode()==-1){
// 数据返回错误 该条记录不进行解析处理
orderLogEntity.setStatus(0);
}
orderLogService.save(orderLogEntity);
logger.info(">>>>>>>>>>>>>> 数据保存orderLogService{}", orderLogService);
// List<StationOrderEntity> rs = new ArrayList<>();
// responseStationOrderVo.getData().forEach(responseStationOrderInfoVo -> {
// StationOrderEntity stationOrderEntity = new StationOrderEntity();
// try {
// buildStationOrderEntityByRelative(responseStationOrderInfoVo, stationOrderEntity);
// } catch (NoSuchFieldException e) {
// e.printStackTrace();
// } catch (IllegalAccessException e) {
// e.printStackTrace();
// }
// rs.add(stationOrderEntity);
//
// });
// logger.info(">>>>>>>>>rs {}",rs);
// stationOrderService.saveBatch(rs);
// 保存数据
logger.info(">>>>>>>>>>>>>> orderLogEntity{}", orderLogEntity);
// 保存数据
return null;
}

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

@ -534,6 +534,7 @@ public class InComingServiceImpl implements IInComingService {
@Transactional(rollbackFor = Exception.class)
public R incomingPackageByTaryCode(InComingDTO inComingDTO) {
try{
AtomicReference<String> audio = new AtomicReference<>();
String orderPackageCode = inComingDTO.getOrderPackageCode();//包件码
Long warehouseId = inComingDTO.getWarehouseId();//仓库id
String warehouseName = inComingDTO.getWarehouseName();
@ -654,7 +655,18 @@ public class InComingServiceImpl implements IInComingService {
map.put("trayCode", trayCode);
map.put("warehouseId", warehouseId);
map.put("orderPackageCode", packageCode);
warehouseTrayTypeClient.orderScanOrderPackageCode(map);
R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
int code = r.getCode();
if(code != 200){
audio.set(r.getMsg());
}else{
String data = (String) r.getData();
if(StringUtil.isNotBlank(data)){
JSONObject parseObj = JSONUtil.parseObj(data);
String audio1 = parseObj.getStr("audio");
audio.set(audio1);
}
}
}
});
}
@ -676,15 +688,30 @@ public class InComingServiceImpl implements IInComingService {
map.put("trayCode", trayCode);
map.put("warehouseId", warehouseId);
map.put("orderPackageCode", packageCode);
warehouseTrayTypeClient.orderScanOrderPackageCode(map);
R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
int code = r.getCode();
if(code != 200){
audio.set(r.getMsg());
}else{
String data = (String) r.getData();
if(StringUtil.isNotBlank(data)){
JSONObject parseObj = JSONUtil.parseObj(data);
String audio1 = parseObj.getStr("audio");
audio.set(audio1);
}
}
}
});
}
}
}
});
String a = audio.get();
if(StringUtil.isNotBlank(a)){
return Resp.scanFail(200,a,a);
}
}catch (Exception e){
e.printStackTrace();
log.error("入库异常",e);
throw new CustomerException("系统异常,请联系管理员");
}

1
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
Unescape View File

@ -773,7 +773,6 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
Set<String> hasOrderPackageCodes = parcelListMap.keySet();
Map<String, DistributionStockArticleEntity> finalStockArticleMap = stockArticleMap;
Map<String, DistributionParcelListEntity> finalParcelListMap = parcelListMap;
Map<String, TrunklineAdvanceEntity> finalAdvanceEntityMap = advanceEntityMap;
Long finalUserId = userId;
Date date = new Date();

Write Preview
Loading…
Cancel
Save