weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nc问题修改

Browse Source
This commit is contained in:
hjx
2025-12-18 00:29:03 +08:00
parent b00308b729
commit b8799a1ec7
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+9 -21
View File
@@ -389,21 +389,6 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
LoginUser loginUser= SecurityUtils.getLoginUser(); LoginUser loginUser= SecurityUtils.getLoginUser();
UserPo userPo=loginUser.getUserPo(); UserPo userPo=loginUser.getUserPo();
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
AjaxResult ajaxResult5=userServiceFeign.getInfo(loginUser.getUserid());
if(ajaxResult5.get("code").toString().equals("200")){
Object userShipperPo= ajaxResult5.get("data");
JSONObject jsonObject = new JSONObject((Map) userShipperPo);
try {
String jsonString = mapper.writeValueAsString(jsonObject);
userPo = mapper.readValue(jsonString, UserPo.class);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
}else{
throw new ServiceException("查询当前登录人用户信息失败");
}
for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){ for (String businessDocumentDetaliId:businessDocumentDetaliIdArray){
Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId); Reconciliation reconciliation=reconciliationMapper.selectById(businessDocumentDetaliId);
if(reconciliation.getSynchronousStatus()==1){ if(reconciliation.getSynchronousStatus()==1){
@@ -435,15 +420,18 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
TmsTransportNote tmsTransportNote= ajaxResult1.getData(); TmsTransportNote tmsTransportNote= ajaxResult1.getData();
if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){ if(ObjectUtil.isNotNull(tmsTransportNote.getIsPaper())){
date=tmsTransportNote.getConfirmReceiptTime(); date=tmsTransportNote.getConfirmReceiptTime();
if(null==date){
date=new Date();
}
dateString = sdf.format(date); dateString = sdf.format(date);
}else{ }else{
throw new ServiceException("运单还没签收， 先签收"); throw new ServiceException("运单还没签收， 先签收");
} }
} }
if(null==reconciliation.getSettlementPartyId()){ /* if(null==reconciliation.getSettlementPartyId()){
throw new ServiceException("没有结算方，请核对"); throw new ServiceException("没有结算方，请核对");
} }*/
if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) { /* if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getSalesmanCodeNc())) {
throw new ServiceException("请先维护业务员编码"); throw new ServiceException("请先维护业务员编码");
} }
if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) { if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getMakerCodeNc())) {
@@ -451,7 +439,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
} }
if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) { if (org.apache.commons.lang.StringUtils.isBlank(tmsOrder.getCustomsCodeNc())) {
throw new ServiceException("请先维护制单员编码"); throw new ServiceException("请先维护制单员编码");
} }*/
makerCodeNc=tmsOrder.getMakerCodeNc(); makerCodeNc=tmsOrder.getMakerCodeNc();
Ysitem item=new Ysitem(); Ysitem item=new Ysitem();
item.setSo_deptid("NG040104"); item.setSo_deptid("NG040104");
@@ -621,9 +609,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
List<SKitem> ysitemList=new ArrayList<SKitem>(); List<SKitem> ysitemList=new ArrayList<SKitem>();
ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); ReconciliationDTO reconciliationDTO=new ReconciliationDTO();
reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber()); reconciliationDTO.setInnerNumber(reconciliation.getInnerNumber());
if(null==reconciliation.getSettlementPartyId()){ /* if(null==reconciliation.getSettlementPartyId()){
throw new ServiceException("没有结算方，请核对"); throw new ServiceException("没有结算方，请核对");
} }*/
String makerCodeNc=""; String makerCodeNc="";
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
if(result.getCode()==200){ if(result.getCode()==200){