diff --git a/blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java b/blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java index 80cadb339..3e55ad416 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java +++ b/blade-biz-common/src/main/java/org/springblade/common/component/MockLoginService.java @@ -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 params = new HashMap<>(); params.put("grant_type", "local_server"); diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java index cc09d0576..3911617ec 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/TaskQuestEntity.java @@ -67,6 +67,10 @@ public class TaskQuestEntity extends TenantEntity { */ @ApiModelProperty(value = "任务单号") private String questNum; + + @ApiModelProperty(value = "盘点任务名称") + private String taskName; + /** * 开始时间 */ diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java index 80a13207b..319124aec 100644 --- a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java +++ b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java @@ -377,6 +377,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl ldsld.is_deleted = 0 - AND ldsld.reservation_id = #{reservationId} + AND ldsld.reservation_id = #{param.reservationId} AND ldsld.stock_package_status != 2 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 006daf2f8..50c06ad59 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -908,7 +908,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>", 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 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; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index ff822bd2a..a38d0be41 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -534,6 +534,7 @@ public class InComingServiceImpl implements IInComingService { @Transactional(rollbackFor = Exception.class) public R incomingPackageByTaryCode(InComingDTO inComingDTO) { try{ + AtomicReference 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("系统异常,请联系管理员"); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index a897e89f6..6e1ef8204 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -773,7 +773,6 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl hasOrderPackageCodes = parcelListMap.keySet(); Map finalStockArticleMap = stockArticleMap; - Map finalParcelListMap = parcelListMap; Map finalAdvanceEntityMap = advanceEntityMap; Long finalUserId = userId; Date date = new Date();