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

推送BUG修复

dist.1.3.0
汤建军 6 months ago
parent
4100ed766e
commit
7e9a85dd0e
9 changed files with 67 additions and 55 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-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
  4. 91
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  5. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  6. 4
      blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java
  7. 6
      blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
  8. 7
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
  9. 5
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java
Unescape View File

@ -54,7 +54,7 @@ public interface IDistributionSignforClient {
@GetMapping(TOP+"push0ldSystemSignInfo")
void push0ldSystemSignInfo(@RequestParam("current") Long signingId);
Map<String ,Object> push0ldSystemSignInfo(@RequestParam("current") Long signingId);
/**

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java
Unescape View File

@ -99,8 +99,8 @@ public class DistributionSignforClient implements IDistributionSignforClient {
* @param signingId
*/
@Override
public void push0ldSystemSignInfo(Long signingId) {
distributionSignforService.push0ldSystemSignInfo(signingId);
public Map<String ,Object> push0ldSystemSignInfo(Long signingId) {
return distributionSignforService.push0ldSystemSignInfo(signingId);
}

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

@ -335,7 +335,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
* 推送老系统
* @param signingId
*/
void push0ldSystemSignInfo(Long signingId);
Map<String ,Object> push0ldSystemSignInfo(Long signingId);
SignforPageCountVO selectDistributionSignforPageCount( DistributionSignforVO distributionSignfor);

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

@ -910,13 +910,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
//统计客户装车数
Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
.eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
.intValue();
Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
.eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())
.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
.eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())
.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
.intValue();
signforEntity.setLoadedNumber(lad);
signforEntity.setLoadedinNumber(nad);
@ -1592,13 +1592,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
* @param signingId
*/
@Override
public void push0ldSystemSignInfo(Long signingId) {
public Map<String, Object> push0ldSystemSignInfo(Long signingId) {
try {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列");
//得到审核的任务ＩＤ
if (ObjectUtil.isEmpty(signingId)) {
log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
return;
return null;
}
//得到签收对象
@ -1608,20 +1608,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (ObjectUtil.isEmpty(distributionSignforEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
return;
return null;
}
//　得到配送计划
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
return;
return null;
}
// 得到配送客户
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
if (ObjectUtil.isEmpty(distributionReservationEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
return;
return null;
}
@ -1727,12 +1727,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
Map<String ,Object> map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
Map<String, Object> map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
return map;
} catch (Exception e) {
log.error(">>>>> 推送老系统签收信息报错", e);
}
return null;
}
@ -2466,7 +2467,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
signforExcel.setDeliveryStatusName(d.getSijiSigningStatus());
signforExcel.setExamineUserName(d.getExamineUserName());
signforExcel.setWarehouseName(d.getWarehouseName());
int unsigneds =d.getReservationNum() - d.getReceivedQuantity();
int unsigneds = d.getReservationNum() - d.getReceivedQuantity();
signforExcel.setUnsigneds(unsigneds);
a.add(signforExcel);
@ -2514,7 +2515,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.fail(403, "仓库信息不能为空");
}
DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distrilbutionloadingscanDTO.getDeliveryId());
//查询是否完成复核
//查询是否完成复核
DistributionSignforEntity signforEntity = this.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
.eq(DistributionSignforEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
);
@ -2809,7 +2810,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanSuccessWithData("签收成功", str, orderPackageCodes);
} catch (Exception e) {
log.error(">>>>> 签收异常报错", e);
throw new CustomerException("签收异常报错"+e.getMessage());
throw new CustomerException("签收异常报错" + e.getMessage());
}
}
@ -2981,7 +2982,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanService.updateById(distributionLoadscanEntity);
packageLockIds.add(distributionLoadscanEntity.getPackageId());
//缺少一个异步维护包件签收的方法
// distributionAsyncService.changeOrderSignforStatus(collect.get(0));
// distributionAsyncService.changeOrderSignforStatus(collect.get(0));
Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
//更新签收人
Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
@ -3013,7 +3014,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("服务器正忙...", "服务器正忙");
}
//查询配送计划的计划司机
distributionLoadscanEntity = new DistributionLoadscanEntity();
distributionLoadscanEntity = new DistributionLoadscanEntity();
if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
}
@ -3071,7 +3072,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
//更新签收人
Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
// 包件解托下架
// 包件解托下架
content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "后台签收,装车方式:补录装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + distributionReservationEntity.getReservationCode();
try {
trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distributionLoadscanEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
@ -3088,7 +3089,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//维护签收包件状态
distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), myCurrentWarehouse.getId());
//推送信息至工厂
// distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(), nickName);
// distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(), nickName);
sendNodeWorkDataBroadcast(parcelListEntity, distributionReservationEntity, distributionLoadscanEntity.getSigningTime(), myCurrentWarehouse);
//收集包件
@ -3097,14 +3098,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// 推送商家端
// 推送
// try {
// sendMessage(orderPackageCode, distributionReservationEntity.getReservationCode(),
// deliveryListEntity.getTrainNumber(), deliveryListEntity.getVehicleName(), deliveryListEntity.getDriverName(),
// AuthUtil.getUserName(), myCurrentWarehouse.getId(), AuthUtil.getTenantId());
// } catch (Exception e) {
//// throw new RuntimeException(e);
// log.error(">>>> 签收推送报错", e);
// }
// try {
// sendMessage(orderPackageCode, distributionReservationEntity.getReservationCode(),
// deliveryListEntity.getTrainNumber(), deliveryListEntity.getVehicleName(), deliveryListEntity.getDriverName(),
// AuthUtil.getUserName(), myCurrentWarehouse.getId(), AuthUtil.getTenantId());
// } catch (Exception e) {
//// throw new RuntimeException(e);
// log.error(">>>> 签收推送报错", e);
// }
} else {
//一个客户下出现重复包条码
@ -3271,7 +3272,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (Func.isEmpty(distributionDeliveryListEntity)) {
return R.fail(403, "配送错误!!!");
}
if (distributionDeliveryListEntity.getKind().equals("2")){
if (distributionDeliveryListEntity.getKind().equals("2")) {
return Resp.scanFail("请调整配送计划", "请调整配送计划");
}
List<Long> packageLockIds = new ArrayList<>();
@ -3390,7 +3391,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setIsAbnormalLoading(2);
distributionLoadscanEntity.setIsAbnormalSigning(2);
distributionLoadscanEntity.setAbnormalNote("异常签收");
loadscanEntity =distributionLoadscanEntity;
loadscanEntity = distributionLoadscanEntity;
log.info("异常签收>>>>>>>>>>>>>>>reservationId:{},deliveryId:{},orderPackageCode:{}", distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getOrderPackageCode());
//进行签收数量的修改
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@ -3422,7 +3423,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
aaa.add(trunklinePackageTrackLog);
} else {
} else {
return Resp.scanFail("操作失败", "不属于该客户");
}
@ -5272,8 +5273,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
signingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())){
log.info("司机一键签收 >>>>>包件已签收:{}",parcelListEntity.getOrderPackageCode());
if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())) {
log.info("司机一键签收 >>>>>包件已签收:{}", parcelListEntity.getOrderPackageCode());
continue;
}
//查询是否进行装车
@ -6097,8 +6098,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setSigningUser(user.getNickName());
loadingNumber += distributionLoadscanEntity.getLoadedNub()+signforEntity.getLoadedNumber();
signingNumber += distributionLoadscanEntity.getReceivedQuantity()+signforEntity.getReceivedQuantity();
loadingNumber += distributionLoadscanEntity.getLoadedNub() + signforEntity.getLoadedNumber();
signingNumber += distributionLoadscanEntity.getReceivedQuantity() + signforEntity.getReceivedQuantity();
//进行签收数量的统计
distributionLoadscanService.updateById(distributionLoadscanEntity);
JSONObject jsonObject = new JSONObject();
@ -6445,14 +6446,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
@Override
public Map<String,Object> clerkCheckPushData(Long id) {
Map<String,Object> resultMap = new HashMap<>();
public Map<String, Object> clerkCheckPushData(Long id) {
Map<String, Object> resultMap = new HashMap<>();
try {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列");
//得到审核的任务ＩＤ
if (ObjectUtil.isEmpty(id)) {
log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
resultMap.put("result",false);
resultMap.put("result", false);
return resultMap;
}
@ -6463,14 +6464,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (ObjectUtil.isEmpty(distributionSignforEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
resultMap.put("result",false);
resultMap.put("result", false);
return resultMap;
}
//　得到配送计划
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
resultMap.put("result",false);
resultMap.put("result", false);
return resultMap;
}
@ -6478,7 +6479,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
if (ObjectUtil.isEmpty(distributionReservationEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
resultMap.put("result",false);
resultMap.put("result", false);
return resultMap;
}
@ -6587,7 +6588,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
log.info(">>>> clerkCheckPushData SignPushDataDTO :{}", delivery);
resultMap= oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
resultMap = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
return resultMap;
} catch (Exception e) {
log.error(">>>>> 推送老系统签收信息报错", e);
@ -6752,7 +6753,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
List<DistributionAddvaluePackageDTO> list = new ArrayList<>();
if (!addvaluePackageVOS.isEmpty()) {
addvaluePackageVOS.forEach(a->{
addvaluePackageVOS.forEach(a -> {
DistributionAddvaluePackageDTO dto = Func.copy(a, DistributionAddvaluePackageDTO.class);
list.add(dto);
});
@ -6858,11 +6859,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (k.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())
&& k.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
String content = "包件在" + warehouse.getName() + "由" + user.getNickName() + "完成复核,配送车次号:" + trainNumber + "预约任务号:" + reservationEntity.getReservationCode();
JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CLERK_REVIEW.getCode(),trainNumber,new Date());
JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CLERK_REVIEW.getCode(), trainNumber, new Date());
aaa.add(js);
} else {
String content = "包件在" + warehouse.getName() + "由" + user.getNickName() + "复核取消计划无操作包件,配送车次号:" + trainNumber + "预约任务号:" + reservationEntity.getReservationCode();
JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(),trainNumber,new Date());
JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(), trainNumber, new Date());
aaa.add(js);
}
});
@ -6932,8 +6933,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
private JSONObject handleLogJSONObject(BasicdataWarehouseEntity warehouse, BladeUser user, String orderPackageCode, String content, Integer node, String trainNumber, Date warehouseEntryTimeEnd) {
JSONObject trunklinePackageTrackLog = new JSONObject();
trunklinePackageTrackLog.put("tenantId", user.getTenantId());
@ -6956,6 +6955,4 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
}

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -3575,7 +3575,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
}
List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
.eq(DistributionBillLadingScanEntity::getMaterialType, "2")
);
if (ladingScanEntities.isEmpty()){
return R.fail("无签收数据!!");

4
blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java
Unescape View File

@ -48,15 +48,13 @@ public class SignPushClient implements IOldSignPushClient {
result= true;
}else {
String msg = res.getString("msg");
resultMap.put("msg",result);
resultMap.put("msg",msg);
log.info(">>>> pushOldSystemSignInfo response msg:{}",msg);
log.info(">>>> pushOldSystemSignInfo 推送配送ID signPushDataDTO ID:{}",signPushDataDTO.getId());
}
}
log.info(">>>> pushOldSystemSignInfo response url:{} body:{}",url,body);
log.info(">>>> pushOldSystemSignInfo 程序执行 end time : {} >> return result :{} ",System.currentTimeMillis(),result);
resultMap.put("result",result);

6
blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
Unescape View File

@ -205,6 +205,9 @@ public class DistributionDatarepair {
warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1);
log.info(">>> 推送成功 {}", id);
} else {
String remarks = (String) map.get("msg");
//进行错误记录
warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks);
log.error(">>> 推送失败 id=" + id);
}
}
@ -220,11 +223,14 @@ public class DistributionDatarepair {
@XxlJob("pushSingleNotification")
public ReturnT<String> pushSingleNotification(String params) {
Map<String, Object> map = distributionSignforClient.clerkCheckPushData(Long.parseLong(params));
Long id = Long.parseLong(params);
Boolean b = (Boolean) map.get("b");
if (b != null && b) {
warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1);
log.info(">>> 推送成功 {}", Long.parseLong(params));
} else {
String remarks = (String) map.get("msg");
warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks);
log.error(">>> 推送失败 id=" + Long.parseLong(params));
}
return ReturnT.SUCCESS;

7
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
Unescape View File

@ -123,5 +123,12 @@ public interface WarehouseMappingDataMapper {
List<StockAllocationInfoVO> findStockAllocationInfo();
void updateClearSignforStatusBysignforId(@Param("singnforId")Long singnforId, @Param("dealStatus") Integer dealStatus);
/**
* 修改备注
* @param id
* @param msg
*/
void updateClearSignforRemarks(@Param("singnforId")Long id,@Param("remarks") String remarks);
}

5
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
Unescape View File

@ -354,6 +354,11 @@
set deal_status = #{dealStatus}
where singnfor_id = #{singnforId}
</update>
<update id="updateClearSignforRemarks">
update clear_singnfor_status_record
set deal_status = #{dealStatus}
where remarks = #{remarks}
</update>
<select id="findPackageTraysInfo" resultType="com.logpm.patch.vo.PackageTrayInfoVO">
select lwtg.association_value orderPackageCode,

Write Preview
Loading…
Cancel
Save