aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-01 09:30:12 +08:00
parent f801c043ae
commit 4e5cea1487
11 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -563,7 +563,7 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/autoDoSendSmsTrigger")
public AjaxResult autoDoSendSmsTrigger(){
String lockKey="autoDoSendSmsTrigger";
log.error("autoDoSendSmsTrigger start");
log.info("autoDoSendSmsTrigger start");
// 加锁查询
redissonService.lock(lockKey,300);
@ -573,7 +573,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
log.error("autoDoSendSmsTrigger exception:"+ex.getMessage());
}
log.error("autoDoSendSmsTrigger end");
log.info("autoDoSendSmsTrigger end");
redissonService.unlock(lockKey);
return AjaxResult.success("发送成功");
@ -584,7 +584,7 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/autoQueryInvoiceStatusTrigger")
public AjaxResult autoQueryInvoiceStatusTrigger(){
String lockKey="autoQueryInvoiceStatusTrigger";
log.error("autoQueryInvoiceStatusTrigger start");
log.info("autoQueryInvoiceStatusTrigger start");
// 加锁查询
redissonService.lock(lockKey,300);
@ -594,7 +594,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
log.error("autoQueryInvoiceStatusTrigger exception:"+ex.getMessage());
}
log.error("autoQueryInvoiceStatusTrigger end");
log.info("autoQueryInvoiceStatusTrigger end");
redissonService.unlock(lockKey);
return AjaxResult.success("成功");
@ -637,7 +637,7 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/autoDoProfitTrigger")
public AjaxResult autoDoProfitTrigger(){
String lockKey="autoDoProfitTrigger";
log.error("autoDoProfitTrigger start");
log.info("autoDoProfitTrigger start");
// 加锁查询
redissonService.lock(lockKey,300);
@ -647,7 +647,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
log.error("autoDoProfitTrigger exception:"+ex.getMessage());
}
log.error("autoDoProfitTrigger end");
log.info("autoDoProfitTrigger end");
redissonService.unlock(lockKey);
return AjaxResult.success("发送成功");
@ -683,7 +683,7 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/autoDoBillTrigger")
public AjaxResult autoDoBillTrigger(){
String lockKey="autoDoBillTrigger";
log.error("autoDoBillTrigger start");
log.info("autoDoBillTrigger start");
// 加锁查询
redissonService.lock(lockKey,300);
@ -693,7 +693,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
log.error("autoDoBillTrigger exception:"+ex.getMessage());
}
log.error("autoDoBillTrigger end");
log.info("autoDoBillTrigger end");
redissonService.unlock(lockKey);
return AjaxResult.success("发送成功");
@ -738,7 +738,7 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/redoGenerateBillFeeItem")
public AjaxResult redoGenerateBillFeeItem(String billCode){
String lockKey="redoGenerateBillFeeItem";
log.error("redoGenerateBillFeeItem start");
log.info("redoGenerateBillFeeItem start");
// 加锁查询
redissonService.lock(lockKey,300);
@ -748,7 +748,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
log.error("redoGenerateBillFeeItem exception:"+ex.getMessage());
}
log.error("redoGenerateBillFeeItem end");
log.info("redoGenerateBillFeeItem end");
redissonService.unlock(lockKey);
return AjaxResult.success("发送成功");
@ -762,7 +762,7 @@ public class EmisCommonController extends EmisBaseController
@GetMapping("/autoDoQueryTransferInfoTrigger")
public AjaxResult autoDoQueryTransferInfoTrigger(){
String lockKey="autoDoQueryTransferInfoTrigger";
log.error("autoDoQueryTransferInfoTrigger start");
log.info("autoDoQueryTransferInfoTrigger start");
// 加锁查询
redissonService.lock(lockKey,300);
@ -772,7 +772,7 @@ public class EmisCommonController extends EmisBaseController
ex.printStackTrace();
log.error("autoDoQueryTransferInfoTrigger exception:"+ex.getMessage());
}
log.error("autoDoQueryTransferInfoTrigger end");
log.info("autoDoQueryTransferInfoTrigger end");
redissonService.unlock(lockKey);
return AjaxResult.success("发送成功");
@ -782,14 +782,14 @@ public class EmisCommonController extends EmisBaseController
@PostMapping("/notifyTraceByKD100")
public String notifyTraceByKD100(){
String lockKey="notifyTraceByKD100";
log.error("notifyTraceByKD100 start");
log.info("notifyTraceByKD100 start");
String rst="{\n" +
" \"result\":true,\n" +
" \"returnCode\":\"200\",\n" +
" \"message\":\"成功\"\n" +
" }";
log.error("notifyTraceByKD100 end");
log.info("notifyTraceByKD100 end");
return rst;
}
@ -797,7 +797,7 @@ public class EmisCommonController extends EmisBaseController
@PostMapping("/notifyTraceBy17track")
public void notifyTraceBy17track(@RequestBody String body){
String lockKey="notifyTraceBy17track";
log.error("notifyTraceBy17track start");
log.info("notifyTraceBy17track start");
/*
{
"event": "TRACKING_UPDATED",
@ -982,7 +982,7 @@ public class EmisCommonController extends EmisBaseController
" \"message\":\"成功\"\n" +
" }";
log.error("notifyTraceBy17track end");
log.info("notifyTraceBy17track end");
}
@ -1067,7 +1067,7 @@ public class EmisCommonController extends EmisBaseController
String billMonth=item.getBillMonth();
String msg="截止"+DateUtils.parseDateToStr("yyyy-MM-dd HH点",new Date())+"有未回款,尽快联系客户收款，账期:"+billMonth+",待收:"+item.getNoRecdPayMoney()+"元，超期:"+item.getExpiredNoRecdPayMoney()+"元!";
AjaxResult rst=NoticeUtils.outSendNoticeToInner(msg,msg,"/ruyERj/BillPaybackSumList",salesmen,3);
log.error(msg);
log.info(msg);
}
}

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -1029,7 +1029,7 @@ public class EmisWaybillController extends EmisBaseController
}
// 循环子单，最多60
log.error("===>billSubCodeAllStr==>",billSubCodeAllStr);
log.info("===>billSubCodeAllStr==>",billSubCodeAllStr);
if(!StringUtils.isEmpty(billSubCodeAllStr)) {
String[] subCodArr=billSubCodeAllStr.split(",");
for (int i=0;i<50 && i<subCodArr.length;i++) {
@ -1308,7 +1308,7 @@ public class EmisWaybillController extends EmisBaseController
}
// 循环子单，最多60
log.error("===>billSubCodeAllStr==>",billSubCodeAllStr);
log.info("===>billSubCodeAllStr==>",billSubCodeAllStr);
if(!StringUtils.isEmpty(billSubCodeAllStr)) {
String[] subCodArr=billSubCodeAllStr.split(",");
for (int i=0;i<50 && i<subCodArr.length;i++) {
@ -1342,7 +1342,7 @@ public class EmisWaybillController extends EmisBaseController
}
}
log.error("打印指令==>{}",sbPrintCmd.toString());
log.info("打印指令==>{}",sbPrintCmd.toString());
String printBase64Data=Base64.getEncoder().encodeToString(sbPrintCmd.toString().getBytes("UTF-8"));
return AjaxResult.success("获取成功",printBase64Data);
}catch (Exception ex){

24
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -902,7 +902,7 @@ public class EmisBaseService {
String phone="1234";
if(emisWaybill==null){
log.error("===>Error:运单号不存在！");
log.info("===>Error:运单号不存在！");
continue;
}
@ -937,7 +937,7 @@ public class EmisBaseService {
Q17trackHelper.register(dt.getTransferBillCode(),kdComId);
rstUpd=Q17trackHelper.queryTmsTransferTrace(dt,kdComId,phone);
}
log.error("===>Start 三方物流跟踪单号:"+dt.getBillCode()+","+dt.getTransferExpress()+" "+dt.getTransferBillCode());
log.info("===>Start 三方物流跟踪单号:"+dt.getBillCode()+","+dt.getTransferExpress()+" "+dt.getTransferBillCode());
// 如果已签收，需要做签收扫描
if(WaybillStatus.SIGNED.statusCode.equals(rstUpd.getLastWaybillStatus())){
@ -956,7 +956,7 @@ public class EmisBaseService {
}
}
emisTmsTransferTraceMapper.updateEmisTmsTransferTrace(rstUpd);
log.error("===>End 三方物流跟踪单号:"+dt.getTraceInfo());
log.info("===>End 三方物流跟踪单号:"+dt.getTraceInfo());
}
}
@ -1135,7 +1135,7 @@ public class EmisBaseService {
@Transactional
public void redoGenerateBill(String billCode) throws EmisBizError{
log.error("===>Start 运单出账:"+billCode);
log.info("===>Start 运单出账:"+billCode);
boolean isNewBill=true;
BigDecimal oldTotalFee = BigDecimal.ZERO;
@ -1146,14 +1146,14 @@ public class EmisBaseService {
if(!CollectionUtils.isEmpty(oldSubBillList) ) {
if(oldSubBillList.size()>1){
log.error("===>已拆子账单不允许出账！");
log.info("===>已拆子账单不允许出账！");
return;
}
isNewBill=false;
for (EmisSettleSubBill oldBill:oldSubBillList) {
if ("1".equals(oldBill.getBlConfirmCenter())) {
log.error("===>账单财务确认不允许出账！");
log.info("===>账单财务确认不允许出账！");
return;
}
oldTotalFee=oldTotalFee.add(oldBill.getBillFee());
@ -1390,7 +1390,7 @@ public class EmisBaseService {
}
log.error("===>End 运单出账");
log.info("===>End 运单出账");
}
/**
@ -1399,7 +1399,7 @@ public class EmisBaseService {
* @throws EmisBizError
*/
public void redoGenerateBillFeeItem(String billCode) throws EmisBizError{
log.error("===>Start 生成费用明细:"+billCode);
log.info("===>Start 生成费用明细:"+billCode);
EmisWaybill dt=emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
@ -1422,7 +1422,7 @@ public class EmisBaseService {
}
}
log.error("===>End 生成费用明细");
log.info("===>End 生成费用明细");
}
/**
@ -1564,7 +1564,7 @@ public class EmisBaseService {
List<EmisSmsSendRecord> list = emisSmsSendRecordMapper.selectEmisSmsSendRecordList(emisSmsSendRecord);
if(!CollectionUtil.isEmpty(list)){
for(EmisSmsSendRecord dt:list){
log.error("===>Start 发送短信:"+dt.getBillCode()+","+dt.getPhone()+" :smsType:"+dt.getSmsType());
log.info("===>Start 发送短信:"+dt.getBillCode()+","+dt.getPhone()+" :smsType:"+dt.getSmsType());
try {
// 发件短信
@ -1639,7 +1639,7 @@ public class EmisBaseService {
dt.setSmsChannel("sms253");
dt.setTaskDate(new Date());
emisSmsSendRecordMapper.updateEmisSmsSendRecord(dt);
log.error("===>End 发送短信");
log.info("===>End 发送短信");
}
}
@ -2219,7 +2219,7 @@ public class EmisBaseService {
catch(Exception ex){
// 非session 用户打印
// ex.printStackTrace();
log.error("非session用户打印");
log.info("非session用户打印");
}
order.put("parcelQty", parcelQty);

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -172,7 +172,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
{
String lockKey="reCalcProfitByBillCode"+billCode;
// 加锁查询
log.error("reCalcProfitByBillCode start:"+billCode);
log.info("reCalcProfitByBillCode start:"+billCode);
redissonService.lock(lockKey, 300);
try {
// 获取运单信息
@ -236,14 +236,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
ex.printStackTrace();
}
redissonService.unlock(lockKey);
log.error("reCalcProfitByBillCode end:"+billCode);
log.info("reCalcProfitByBillCode end:"+billCode);
}
private int reCalcEmpProfitSumMoney(String empName,String billMonth){
String lockKey="reCalcEmpProfitSumMoney_"+empName+billMonth;
// 加锁查询
log.error("reCalcEmpProfitSumMoney start:"+empName+billMonth);
log.info("reCalcEmpProfitSumMoney start:"+empName+billMonth);
redissonService.lock(lockKey, 300);
try {
// 获取统计数据
@ -264,7 +264,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
ex.printStackTrace();
}
redissonService.unlock(lockKey);
log.error("reCalcProfitByBillCode end:"+empName+billMonth);
log.info("reCalcProfitByBillCode end:"+empName+billMonth);
return 1;
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -484,7 +484,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
EmisSettleBill oldBill = getSettleBillBySettleBillNo(settleBillNo);
if(oldBill==null){
log.error("reCalcSettleBillInvoiceStatus==>账单不存在:"+settleBillNo);
log.info("reCalcSettleBillInvoiceStatus==>账单不存在:"+settleBillNo);
return 0;
}
@ -539,8 +539,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
}
}
log.error("==>reCalcSettleBillInvoiceStatus:totalMoney={},recMoney={},recMoney-totalMoney:{}",totalMoney,oldBill.getRecMoney());
log.error("==>reCalcSettleBillInvoiceStatus:recMoney-totalMoney:{}",oldBill.getRecMoney().compareTo(totalMoney));
log.info("==>reCalcSettleBillInvoiceStatus:totalMoney={},recMoney={},recMoney-totalMoney:{}",totalMoney,oldBill.getRecMoney());
log.info("==>reCalcSettleBillInvoiceStatus:recMoney-totalMoney:{}",oldBill.getRecMoney().compareTo(totalMoney));
EmisSettleBill newBill = new EmisSettleBill();
newBill.setId(oldBill.getId());

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -242,7 +242,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
updProfit.setBillProfit(emisTmsCostProfit.getBillFee().subtract(updProfit.getCostFee()));
emisTmsCostProfitMapper.updateEmisTmsCostProfit(updProfit);
log.error("==>费用计算:==>:{}: {}-{}=",billCode,updProfit.getBillFee(),updProfit.getCostFee(),updProfit.getBillProfit());
log.info("==>费用计算:==>:{}: {}-{}=",billCode,updProfit.getBillFee(),updProfit.getCostFee(),updProfit.getBillProfit());
return 1;
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -2494,7 +2494,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
});
}
log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
log.info("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
return listTraces;
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -3503,7 +3503,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
)
{
log.error("计算体积重量错误，参数不完整");
log.info("计算体积重量错误，参数不完整");
emisWaybill.setVolumeWeight(BigDecimal.ZERO);
emisWaybill.setMeterType("0");
return;

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/openbill/hx/HXSdk.java
View File

@ -164,10 +164,10 @@ public class HXSdk {
String url = HX_URLPREFIX+"/open/service/orderReceive";
JSONObject jObjPost = new JSONObject();
jObjPost.put("orders",orderList);
log.error("==>asyncOpenBillReceive POST==>{}",jObjPost.toJSONString());
log.info("==>asyncOpenBillReceive POST==>{}",jObjPost.toJSONString());
HttpResponse response = HttpUtil.createPost(url).header("Authorization", token).body(jObjPost.toJSONString()).execute();
String result = response.body();
log.error("==>asyncOpenBillReceive RES==>{}",result);
log.info("==>asyncOpenBillReceive RES==>{}",result);
JSONObject jRstObj = JSONObject.parseObject(result);
return jRstObj;
@ -237,10 +237,10 @@ isOfferInvoiceDetail String N 1 是否需要提供明细 Y-提供，N-不提供
String url = HX_URLPREFIX+"/open/service/queryInvoiceResult";
JSONObject jObjPost = new JSONObject();
jObjPost.put("orderNos",orderNos);
log.error("===>queryInvoiceResult=POST=>{}",jObjPost.toJSONString());
log.info("===>queryInvoiceResult=POST=>{}",jObjPost.toJSONString());
HttpResponse response = HttpUtil.createPost(url).header("Authorization", token).body(jObjPost.toJSONString()).execute();
String result = response.body();
log.error("===>queryInvoiceResult==RES==>{}",result);
log.info("===>queryInvoiceResult==RES==>{}",result);
JSONObject jRstObj = JSONObject.parseObject(result);
return jRstObj;

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/warehouse/DocUtils.java
View File

@ -45,7 +45,7 @@ public class DocUtils {
private static class FontSubstitutionWarningCollector implements IWarningCallback {
public void warning(WarningInfo info) {
if (info.getWarningType() == WarningType.FONT_SUBSTITUTION) {
log.error("==>font miss==>{}", info.getDescription());
log.info("==>font miss==>{}", info.getDescription());
}
}
}

3
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
View File

@ -299,7 +299,6 @@ public class WaybillHelper {
*/
public static String formatQueryValue(String str) {
if(!StringUtils.isEmpty(str)){
log.error("==formatQueryValue111==>str:{}",str);
try {
str= URLDecoder.decode(str,"UTF-8");
} catch (UnsupportedEncodingException e) {
@ -314,7 +313,6 @@ public class WaybillHelper {
str=str.replaceAll(",+", ",");
str=StringUtils.removeEnd(str, ",");
str=removeUnSeeChar(str);
log.error("==formatQueryValue222==>str:{}",str);
}
return str;
@ -324,7 +322,6 @@ public class WaybillHelper {
String dataFrom="None";
try{
dataFrom= ServletUtils.getRequest().getHeader("dataFrom");
log.error("==dataFrom==>",dataFrom);
}catch (Exception ex){
ex.printStackTrace();
}