luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修改

Browse Source
release
xuliangwei 2 years ago
parent 7b57c4f5d6
commit b54cec37ed
3 changed files with 20 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
  2. 30
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  3. 3
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java

4
dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
Unescape View File

@ -1213,7 +1213,7 @@ public class InterfaceController extends AbstractController {
bzdhs.add(zdata1.getZBZDH()); bzdhs.add(zdata1.getZBZDH());
}); });
RequestRecord receiveErpInvoiceMessageRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(erpInvoiceData), RequestRecord receiveErpInvoiceMessageRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(erpInvoiceData),
"/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "receiveErpInvoiceMessage", 0); "/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "receiveErpInvoiceMessage");
receiveErpInvoiceMessageRecord.setBzdh(JSONObject.toJSONString(bzdhs)); receiveErpInvoiceMessageRecord.setBzdh(JSONObject.toJSONString(bzdhs));
try { try {
@ -1257,7 +1257,7 @@ public class InterfaceController extends AbstractController {
fphms.add(invoiceNo); fphms.add(invoiceNo);
} }
RequestRecord transferOutRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(erpInvoiceData), RequestRecord transferOutRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(erpInvoiceData),
"/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "transferOut", 0); "/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "transferOut");
for(Map<String ,Object> map:list){ for(Map<String ,Object> map:list){
String invoiceCode =(String) map.get("ZFPDM"); String invoiceCode =(String) map.get("ZFPDM");

30
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
Unescape View File

@ -302,18 +302,19 @@ public class SDNYMainProcessController extends AbstractController {
} }
} }
RequestRecord singleCheckInvoiceRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(pramsMap), // RequestRecord singleCheckInvoiceRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(pramsMap),
"/singleInvoiceCheck", pramsMap.get("invoiceCode"),pramsMap.get("invoiceNumber"), // "/singleInvoiceCheck", pramsMap.get("invoiceCode"),pramsMap.get("invoiceNumber"),
"singleCheckInvoice",1); // "singleCheckInvoice",1);
try { try {
checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap); checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap);
singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice");
singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult));
log.info("查验结果为:{}", checkInvoiceResult); log.info("查验结果为:{}", checkInvoiceResult);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("查验失败，errormsg:{}",e.getMessage()); log.error("查验失败，errormsg:{}",e.getMessage());
requestRecordService.saveRecord(singleCheckInvoiceRecord,1,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())),1);
requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())), 1); requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())), 1);
return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，"+e.getMessage()))); return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())));
@ -326,7 +327,6 @@ public class SDNYMainProcessController extends AbstractController {
data = errorInfo(checkInvoiceResult, data); data = errorInfo(checkInvoiceResult, data);
requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(data), 0); requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(data), 0);
requestRecordService.saveRecord(singleCheckInvoiceRecord,1,1,JSONObject.toJSONString(checkInvoiceResult), 0);
return ResponseEntity.ok(JSONObject.toJSONString(data)); return ResponseEntity.ok(JSONObject.toJSONString(data));
@ -343,7 +343,6 @@ public class SDNYMainProcessController extends AbstractController {
signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName); signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName);
requestRecordService.saveRecord(singleInvoiceCheckRecord,0,0,JSONObject.toJSONString(data)); requestRecordService.saveRecord(singleInvoiceCheckRecord,0,0,JSONObject.toJSONString(data));
requestRecordService.saveRecord(singleCheckInvoiceRecord,0,0,JSONObject.toJSONString(checkInvoiceResult));
} }
return ResponseEntity.ok(JSONObject.toJSONString(data)); return ResponseEntity.ok(JSONObject.toJSONString(data));
@ -637,7 +636,8 @@ public class SDNYMainProcessController extends AbstractController {
"/syncInvoiceInfo", "/syncInvoiceInfo",
JSONObject.toJSONString(invoiceCodes), JSONObject.toJSONString(invoiceCodes),
JSONObject.toJSONString(invoiceNos), JSONObject.toJSONString(invoiceNos),
"syncInvoiceInfo", 0); "syncInvoiceInfo");
record.setImageId(snRequestObject.getImageId());
String dbName = "business"; String dbName = "business";
// 入参统一在入口处理 // 入参统一在入口处理
@ -714,19 +714,21 @@ public class SDNYMainProcessController extends AbstractController {
JSONObject request = new JSONObject(); JSONObject request = new JSONObject();
request.put("IS_INPUT", object); request.put("IS_INPUT", object);
RequestRecord pushCheckResultToSAPRecord =requestRecordService.getBaseRequestRecord(request.toJSONString(), // RequestRecord pushCheckResultToSAPRecord =requestRecordService.getBaseRequestRecord(request.toJSONString(),
"/syncInvoiceInfo", // "/syncInvoiceInfo",
JSONObject.toJSONString(invoiceCodes), // JSONObject.toJSONString(invoiceCodes),
JSONObject.toJSONString(invoiceNos), // JSONObject.toJSONString(invoiceNos),
"pushCheckResultToSAP", 1); // "pushCheckResultToSAP", 1);
try { try {
record.setActiveCall("pushCheckResultToSAP");
//将信息推送到影像系统 //将信息推送到影像系统
result = snPushCheckRecordService.pushCheckResultToSAP(request.toJSONString()); result = snPushCheckRecordService.pushCheckResultToSAP(request.toJSONString());
record.setActiveCallResponse(JSONObject.toJSONString(result));
R data = new R(1000, "default success"); R data = new R(1000, "default success");
data.put("data", result); data.put("data", result);
requestRecordService.saveRecord(pushCheckResultToSAPRecord,0, 0, JSONObject.toJSONString(data));
requestRecordService.saveRecord(record,0, 0, JSONObject.toJSONString(data)); requestRecordService.saveRecord(record,0, 0, JSONObject.toJSONString(data));
return ResponseEntity.ok(JSONObject.toJSONString(data)); return ResponseEntity.ok(JSONObject.toJSONString(data));
@ -734,7 +736,7 @@ public class SDNYMainProcessController extends AbstractController {
e.printStackTrace(); e.printStackTrace();
log.error("", e); log.error("", e);
requestRecordService.saveRecord(pushCheckResultToSAPRecord,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1); // requestRecordService.saveRecord(pushCheckResultToSAPRecord,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1);
requestRecordService.saveRecord(record,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1); requestRecordService.saveRecord(record,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1);
return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)));

3
dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java
Unescape View File

@ -15,6 +15,7 @@ import com.github.pagehelper.PageHelper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -33,7 +34,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl<RequestRecordDao
@Resource @Resource
private SNPushCheckRecordService snPushCheckRecordService; private SNPushCheckRecordService snPushCheckRecordService;
@Transactional(rollbackFor = Exception.class)
@Override @Override
public int saveRecord(RequestRecord record, Integer failedTimes, Integer status, String responseDetail, Integer... failedReason) { public int saveRecord(RequestRecord record, Integer failedTimes, Integer status, String responseDetail, Integer... failedReason) {
DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);

Write Preview
Loading…
Cancel
Save