xiaosuonian
/
yixindibang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.调整星空对接接口

This commit is contained in:
xiaosuonian 2025-06-27 19:52:14 +08:00
parent c39cabcf5e
commit b6d9def4be
7 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java
View File

@ -181,11 +181,11 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
poundBill.initAddFields(poundBill); poundBill.initAddFields(poundBill);
boolean save = save(poundBill); boolean save = save(poundBill);
//调用磅单回调接口。 //调用磅单回调接口。
// try { try {
// apiPostBack.makePoundBillFormData(poundBill.getId()); apiPostBack.makePoundBillFormData(poundBill.getId());
// } catch (IOException e) { } catch (IOException e) {
// throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage()); throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage());
// } }
if(save){ if(save){
return 1; return 1;
}else{ }else{
@ -330,11 +330,11 @@ public class PoundBillServiceImpl extends ServiceImpl<PoundBillMapper, PoundBill
boolean b = updateById(byId); boolean b = updateById(byId);
//推送榜单信息到星空系统 //推送榜单信息到星空系统
//调用磅单回调接口。 //调用磅单回调接口。
// try { try {
// apiPostBack.makePoundBillFormData(poundBill.getId()); apiPostBack.makePoundBillFormData(poundBill.getId());
// } catch (IOException e) { } catch (IOException e) {
// throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage()); throw new RuntimeException("磅单:" + poundBill.getUsrcode() + "推送星空时，出现异常："+e.getMessage());
// } }
if(b){ if(b){
return 1; return 1;
}else{ }else{

9
measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java
View File

@ -62,7 +62,7 @@ public class ApiPostBack {
if ("SAL_DELIVERYNOTICE".equals(srcblltype) || "PUR_ReceiveBill".equals(srcblltype)){ if ("SAL_DELIVERYNOTICE".equals(srcblltype) || "PUR_ReceiveBill".equals(srcblltype)){
String fid = poundBill.getFid(); String fid = poundBill.getFid();
if(!"0".equals(fid)){ if(!"0".equals(fid)){
if(checkOaBillExist(srcblltype,id)) throw new RuntimeException("磅单在星空已经存在下游单据，不允许修改，如需修改请前往星空平台删除下游单据！"); if(checkOaBillExist(srcblltype,fid)) throw new RuntimeException("磅单在星空已经存在下游单据，不允许修改，如需修改请前往星空平台删除下游单据！");
} }
} }
@ -102,7 +102,7 @@ public class ApiPostBack {
} }
poundBill.setFid(fid); poundBill.setFid(fid);
poundBill.setFentity_fentryid(fEntryID); poundBill.setFentity_fentryid(fEntryID);
poundBillService.updatePoundBill(poundBill); poundBillService.updateById(poundBill);
} }
//单据下推 //单据下推
@ -216,8 +216,9 @@ public class ApiPostBack {
JSONArray dataList = JSONArray.parseArray(oaData); JSONArray dataList = JSONArray.parseArray(oaData);
for (int i = 0; i < dataList.size(); i++) { for (int i = 0; i < dataList.size(); i++) {
JSONArray row = dataList.getJSONArray(i); JSONArray row = dataList.getJSONArray(i);
Integer joinQty = row.getInteger(0); if (row.size() < 1) continue;
if (joinQty > 0) { String joinQty = row.getString(0);
if (Double.parseDouble(joinQty) > 0) {
result = true; result = true;
break; break;
} }

4
measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java
View File

@ -5,9 +5,9 @@ import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler;
import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel;
import com.sun.tools.javac.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* @author 16358 * @author 16358
@ -19,7 +19,7 @@ public class PURHandler implements BillHandler {
public DynamicFormRequest buildRequest(PoundBill bill) { public DynamicFormRequest buildRequest(PoundBill bill) {
DynamicFormRequest request = new DynamicFormRequest("PUR_ReceiveBill"); DynamicFormRequest request = new DynamicFormRequest("PUR_ReceiveBill");
RequestData data = new RequestData(); RequestData data = new RequestData();
data.setNeedReturnFields(new ArrayList<>(List.of("FID","FDetailEntity.FEntryid"))); data.setNeedReturnFields(Arrays.asList("FID", "FDetailEntity.FEntryid"));
PURModel model = new PURModel(bill); PURModel model = new PURModel(bill);
data.setModel(model); data.setModel(model);
request.setData(data); request.setData(data);

4
measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java
View File

@ -5,9 +5,9 @@ import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler;
import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.SALModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.SALModel;
import com.sun.tools.javac.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* @author 16358 * @author 16358
@ -19,7 +19,7 @@ public class SALHandler implements BillHandler {
public DynamicFormRequest buildRequest(PoundBill bill) { public DynamicFormRequest buildRequest(PoundBill bill) {
DynamicFormRequest request = new DynamicFormRequest("SAL_DELIVERYNOTICE"); DynamicFormRequest request = new DynamicFormRequest("SAL_DELIVERYNOTICE");
RequestData data = new RequestData(); RequestData data = new RequestData();
data.setNeedReturnFields(new ArrayList<>(List.of("FID","FEntity.FEntryid"))); data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid"));
SALModel model = new SALModel(bill); SALModel model = new SALModel(bill);
data.setModel(model); data.setModel(model);
request.setData(data); request.setData(data);

4
measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java
View File

@ -6,9 +6,9 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.SPModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.SPModel;
import com.sun.tools.javac.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* @author 16358 * @author 16358
@ -20,7 +20,7 @@ public class SPHandler implements BillHandler {
public DynamicFormRequest buildRequest(PoundBill bill) { public DynamicFormRequest buildRequest(PoundBill bill) {
DynamicFormRequest request = new DynamicFormRequest("SP_InStock"); DynamicFormRequest request = new DynamicFormRequest("SP_InStock");
RequestData data = new RequestData(); RequestData data = new RequestData();
data.setNeedReturnFields(new ArrayList<>(List.of("FID","FEntity.FEntryid"))); data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid"));
SPModel model = new SPModel(bill); SPModel model = new SPModel(bill);
data.setModel(model); data.setModel(model);
request.setData(data); request.setData(data);

4
measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java
View File

@ -5,9 +5,9 @@ import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler;
import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel;
import com.sun.tools.javac.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* @author 16358 * @author 16358
@ -19,7 +19,7 @@ public class STKHandler implements BillHandler {
public DynamicFormRequest buildRequest(PoundBill bill) { public DynamicFormRequest buildRequest(PoundBill bill) {
DynamicFormRequest request = new DynamicFormRequest("STK_TRANSFERAPPLY"); DynamicFormRequest request = new DynamicFormRequest("STK_TRANSFERAPPLY");
RequestData data = new RequestData(); RequestData data = new RequestData();
data.setNeedReturnFields(new ArrayList<>(List.of("FID","FEntity.FEntryid"))); data.setNeedReturnFields(Arrays.asList("FID", "FEntity.FEntryid"));
STKModel model = new STKModel(bill); STKModel model = new STKModel(bill);
data.setModel(model); data.setModel(model);
request.setData(data); request.setData(data);

4
measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKTDHandler.java
View File

@ -6,9 +6,9 @@ import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest;
import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel;
import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKTDModel; import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKTDModel;
import com.sun.tools.javac.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
/** /**
* @author 16358 * @author 16358
@ -19,7 +19,7 @@ public class STKTDHandler implements BillHandler {
public DynamicFormRequest buildRequest(PoundBill bill) { public DynamicFormRequest buildRequest(PoundBill bill) {
DynamicFormRequest request = new DynamicFormRequest("STK_TransferDirect"); DynamicFormRequest request = new DynamicFormRequest("STK_TransferDirect");
RequestData data = new RequestData(); RequestData data = new RequestData();
data.setNeedReturnFields(new ArrayList<>(List.of("FID","FBillEntry.FEntryid"))); data.setNeedReturnFields(Arrays.asList("FID", "FBillEntry.FEntryid"));
STKTDModel model = new STKTDModel(bill); STKTDModel model = new STKTDModel(bill);
data.setModel(model); data.setModel(model);
request.setData(data); request.setData(data);