gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.付款结果反馈接口调整 

2.北广出入库接口调整
3.注册证生产商链接下载调整
This commit is contained in:
龚豆豆 2025-10-28 13:21:14 +08:00
parent 82dc5f4717
commit 53e6d53ace
7 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lc123/cloud/app/api/controller/CasPaybillController.java
View File

@ -49,20 +49,23 @@ public class CasPaybillController {
List<ApiResultExt.ResultBean> results = new ArrayList<>(); List<ApiResultExt.ResultBean> results = new ArrayList<>();
ApiResultExt resultExt = new ApiResultExt(); ApiResultExt resultExt = new ApiResultExt();
List<String> billnos = new ArrayList<>(); List<String> billnos = new ArrayList<>();
HashMap<String, String> billStatusMap = new HashMap<>(); HashMap<String, JSONObject> billStatusMap = new HashMap<>();
HashMap<String, String> billIdMap = new HashMap<>(); // HashMap<String, String> billIdMap = new HashMap<>();
Set<String> validValues = new HashSet<>(); // Set<String> validValues = new HashSet<>();
validValues.add("4"); // validValues.add("4");
validValues.add("5"); // validValues.add("5");
validValues.add("6"); // validValues.add("6");
validValues.add("7"); // validValues.add("7");
validValues.add("8"); // validValues.add("8");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); // 目标日期格式 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); // 目标日期格式
for (int i = 0; i < data.size(); i++) { for (int i = 0; i < data.size(); i++) {
HashMap<String, Object> dataMap = data.get(i); HashMap<String, Object> dataMap = data.get(i);
String billno = (String) dataMap.get("billno"); String billno = (String) dataMap.get("billno");
billnos.add(billno); billnos.add(billno);
billStatusMap.put(billno, (String) dataMap.get("billstatus")); JSONObject jsonObject = new JSONObject();
jsonObject.put("billstatus",dataMap.get("billstatus"));
jsonObject.put("tqq9_digital_receipt",dataMap.get("tqq9_digital_receipt"));
billStatusMap.put(billno, jsonObject);
} }
QFilter qFilter = new QFilter("billno", QCP.in, billnos); QFilter qFilter = new QFilter("billno", QCP.in, billnos);
DynamicObject[] cas_paybills = BusinessDataServiceHelper.load(Constants.CAS_PAYBILL, LC_PAYBILL_PROPERTIES, qFilter.toArray()); DynamicObject[] cas_paybills = BusinessDataServiceHelper.load(Constants.CAS_PAYBILL, LC_PAYBILL_PROPERTIES, qFilter.toArray());
@ -98,16 +101,16 @@ public class CasPaybillController {
resultBean.setId(cas_paybill.getString("id")); resultBean.setId(cas_paybill.getString("id"));
resultBean.setBillStatus(true); resultBean.setBillStatus(true);
iserror = false; iserror = false;
if(!validValues.contains((String)dataMap.get("billstatus"))){ // if(!validValues.contains((String)dataMap.get("billstatus"))){
ArrayList<String> rowMsg = error.getRowMsg(); // ArrayList<String> rowMsg = error.getRowMsg();
rowMsg.add("传入编号：" + billno + "的交易状态有误"); // rowMsg.add("传入编号：" + billno + "的交易状态有误");
error.setRowMsg(rowMsg); // error.setRowMsg(rowMsg);
error.setEntityKey(Constants.CAS_PAYBILL); // error.setEntityKey(Constants.CAS_PAYBILL);
error.setKeys(keys); // error.setKeys(keys);
resultBean.setId(""); // resultBean.setId("");
resultBean.setBillStatus(false); // resultBean.setBillStatus(false);
index++; // index++;
} // }
} }
} }
if (iserror) { if (iserror) {
@ -126,25 +129,30 @@ public class CasPaybillController {
OperateOption option = OperateOption.create(); OperateOption option = OperateOption.create();
for (DynamicObject cas_paybill : cas_paybills) { for (DynamicObject cas_paybill : cas_paybills) {
String billstatus = billStatusMap.get(cas_paybill.getString("billno")); JSONObject json = billStatusMap.get(cas_paybill.getString("billno"));
if (StringUtils.equals("5", billstatus)) { String billstatus = json.getString("billstatus");
// cas_paybill.set("billstatus", "D"); String tqq9_digital_receipt = json.getString("tqq9_digital_receipt");
if (StringUtils.equals("D", billstatus)) {
OperationResult payResult = OperationServiceHelper.executeOperate(Constants.TYPE_PAY, Constants.CAS_PAYBILL, new DynamicObject[]{cas_paybill}, option); OperationResult payResult = OperationServiceHelper.executeOperate(Constants.TYPE_PAY, Constants.CAS_PAYBILL, new DynamicObject[]{cas_paybill}, option);
List<IOperateInfo> allErrorOrValidateInfo = payResult.getAllErrorOrValidateInfo(); List<IOperateInfo> allErrorOrValidateInfo = payResult.getAllErrorOrValidateInfo();
if (!allErrorOrValidateInfo.isEmpty()) { if (!payResult.isSuccess()) {
index++; index++;
for (IOperateInfo iOperateInfo : allErrorOrValidateInfo) {
HashMap<String, Object> returnMap = resultExt.addErrorToResultBeanByNumber(results, iOperateInfo, Constants.CAS_PAYBILL);
results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
}
}else{
cas_paybill.set("tqq9_digital_receipt", tqq9_digital_receipt);
SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} }
for (IOperateInfo iOperateInfo : allErrorOrValidateInfo) { } else if (StringUtils.equals("F", billstatus) ) {
HashMap<String, Object> returnMap = resultExt.addErrorToResultBeanByNumber(results, iOperateInfo, Constants.CAS_PAYBILL);
results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
}
} else if (StringUtils.equals("4", billstatus) || StringUtils.equals("6", billstatus)) {
cas_paybill.set("billstatus", "F"); cas_paybill.set("billstatus", "F");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} else if (StringUtils.equals("7", billstatus)) { } else if (StringUtils.equals("E", billstatus)) {
cas_paybill.set("billstatus", "E"); cas_paybill.set("billstatus", "E");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} else if (StringUtils.equals("8", billstatus)) { } else if (StringUtils.equals("G", billstatus)) {
cas_paybill.set("billstatus", "G"); cas_paybill.set("billstatus", "G");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} }

2
lc123/cloud/app/api/controller/WMSPurInController.java
View File

@ -176,6 +176,7 @@ public class WMSPurInController {
for (Object detail : details) { for (Object detail : details) {
JSONObject detail1 = (JSONObject) detail; JSONObject detail1 = (JSONObject) detail;
String entryId = detail1.getString("erpDetailId");//金蝶源头单据细单号 String entryId = detail1.getString("erpDetailId");//金蝶源头单据细单号
String wmsDetailId = detail1.getString("wmsDetailId");//WMS入库单细单号
BigDecimal quantity = detail1.getBigDecimal("quantity");//入库数量 BigDecimal quantity = detail1.getBigDecimal("quantity");//入库数量
String uniqueCode = detail1.getString("uniqueCode");//商品编码 String uniqueCode = detail1.getString("uniqueCode");//商品编码
Date manufactureDate = detail1.getDate("manufactureDate");//生产日期 Date manufactureDate = detail1.getDate("manufactureDate");//生产日期
@ -185,6 +186,7 @@ public class WMSPurInController {
String licenceCode = detail1.getString("licenceCode");//生产许可证 String licenceCode = detail1.getString("licenceCode");//生产许可证
String producer = detail1.getString("producer");//生产厂商 String producer = detail1.getString("producer");//生产厂商
detailObject.put("entryId", entryId); detailObject.put("entryId", entryId);
detailObject.put("wmsDetailId", wmsDetailId);
detailObject.put("uniqueCode", uniqueCode); detailObject.put("uniqueCode", uniqueCode);
detailObject.put("quantity", quantity); detailObject.put("quantity", quantity);
detailObject.put("manufactureDate", manufactureDate); detailObject.put("manufactureDate", manufactureDate);

2
lc123/cloud/app/api/controller/WMSSaleOutController.java
View File

@ -169,6 +169,7 @@ public class WMSSaleOutController {
for (Object detail : details) { for (Object detail : details) {
JSONObject detail1 = (JSONObject) detail; JSONObject detail1 = (JSONObject) detail;
String entryId = detail1.getString("erpDetailId");//金蝶源头单据细单号 String entryId = detail1.getString("erpDetailId");//金蝶源头单据细单号
String wmsDetailId = detail1.getString("wmsDetailId");//WMS入库单细单号
BigDecimal quantity = detail1.getBigDecimal("quantity");//出库数量 BigDecimal quantity = detail1.getBigDecimal("quantity");//出库数量
String uniqueCode = detail1.getString("uniqueCode");//商品编码 String uniqueCode = detail1.getString("uniqueCode");//商品编码
Date manufactureDate = detail1.getDate("manufactureDate");//生产日期 Date manufactureDate = detail1.getDate("manufactureDate");//生产日期
@ -178,6 +179,7 @@ public class WMSSaleOutController {
String licenceCode = detail1.getString("licenceCode");//生产许可证 String licenceCode = detail1.getString("licenceCode");//生产许可证
String producer = detail1.getString("producer");//生产厂商 String producer = detail1.getString("producer");//生产厂商
detailObject.put("entryId", entryId); detailObject.put("entryId", entryId);
detailObject.put("wmsDetailId", wmsDetailId);
detailObject.put("uniqueCode", uniqueCode); detailObject.put("uniqueCode", uniqueCode);
detailObject.put("quantity", quantity); detailObject.put("quantity", quantity);
detailObject.put("manufactureDate", manufactureDate); detailObject.put("manufactureDate", manufactureDate);

2
lc123/cloud/app/plugin/form/im/OtherOutApplyBillPlugin.java
View File

@ -193,7 +193,7 @@ public class OtherOutApplyBillPlugin extends AbstractBillPlugIn implements Befor
Date date = new Date(); Date date = new Date();
dataEntity.set("tqq9_bizdate", date); dataEntity.set("tqq9_bizdate", date);
dataEntity.set("tqq9_dblx", "A");//调拨类型 dataEntity.set("tqq9_dblx", "A");//调拨类型
dataEntity.set("tqq9_dbckfl", "C");//调拨出库分类 dataEntity.set("tqq9_dbckfl", "G");//调拨出库分类
dataEntity.set("org", org);//组织 dataEntity.set("org", org);//组织
dataEntity.set("tqq9_dczz1", org);//调出组织 dataEntity.set("tqq9_dczz1", org);//调出组织
dataEntity.set("tqq9_drck2", org);//调入组织 dataEntity.set("tqq9_drck2", org);//调入组织

11
lc123/cloud/app/plugin/form/sys/DownloadAttachmentPlugin.java
View File

@ -22,9 +22,14 @@ public class DownloadAttachmentPlugin extends AbstractBillPlugIn implements Plug
super.itemClick(evt); super.itemClick(evt);
String itemKey = evt.getItemKey(); String itemKey = evt.getItemKey();
if (StringUtils.equals("tqq9_download", itemKey)) { if (StringUtils.equals("tqq9_download", itemKey)) {
String tqq9_zcztplj = this.getModel().getValue("tqq9_zcztplj").toString(); String url = "";
if (StringUtils.isNotBlank(tqq9_zcztplj)) { url = this.getModel().getValue("tqq9_zcztplj_tag").toString();
this.getView().openUrl(tqq9_zcztplj); if (StringUtils.isBlank(url)) {
url = this.getModel().getValue("tqq9_zcztplj").toString();
}
String[] split = url.split(",");
for (String s : split) {
this.getView().openUrl(s);
} }
} }
} }

2
lc123/cloud/app/plugin/operate/im/PurInConvertPlugin.java
View File

@ -74,6 +74,7 @@ public class PurInConvertPlugin extends AbstractConvertPlugIn implements Plugin
quantity = new BigDecimal(jsonMap.get("quantity").toString()).negate();//入库数量 quantity = new BigDecimal(jsonMap.get("quantity").toString()).negate();//入库数量
} }
String batch = jsonMap.get("batch") != null ? jsonMap.get("batch").toString() : null; // 批次 String batch = jsonMap.get("batch") != null ? jsonMap.get("batch").toString() : null; // 批次
String wmsDetailId = jsonMap.get("wmsDetailId") != null ? jsonMap.get("wmsDetailId").toString() : null; // WMS分录id
String uniqueCode = jsonMap.get("uniqueCode") != null ? jsonMap.get("uniqueCode").toString() : null; // 商品编码 String uniqueCode = jsonMap.get("uniqueCode") != null ? jsonMap.get("uniqueCode").toString() : null; // 商品编码
String registrationCode = jsonMap.get("registrationCode") != null ? jsonMap.get("registrationCode").toString() : null; // 注册证号 String registrationCode = jsonMap.get("registrationCode") != null ? jsonMap.get("registrationCode").toString() : null; // 注册证号
String licenceCode = jsonMap.get("licenceCode") != null ? jsonMap.get("licenceCode").toString() : null; // 生产许可证号 String licenceCode = jsonMap.get("licenceCode") != null ? jsonMap.get("licenceCode").toString() : null; // 生产许可证号
@ -87,6 +88,7 @@ public class PurInConvertPlugin extends AbstractConvertPlugIn implements Plugin
entry.set("producedate", manufactureDate); entry.set("producedate", manufactureDate);
entry.set("expirydate", expirationDate); entry.set("expirydate", expirationDate);
entry.set("lotnumber", batch); entry.set("lotnumber", batch);
entry.set("tqq9_wmsdetailid", wmsDetailId);
entry.set("tqq9_licenseno", licenceCode); entry.set("tqq9_licenseno", licenceCode);
entry.set("tqq9_registration", tqq9_registration); entry.set("tqq9_registration", tqq9_registration);
entry.set("tqq9_proxyandfactory", tqq9_proxyandfactory); entry.set("tqq9_proxyandfactory", tqq9_proxyandfactory);

2
lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java
View File

@ -75,6 +75,7 @@ public class SaleOutBillConvertPlugin extends AbstractConvertPlugIn implements P
expirationDate = new Date(expiration.longValue()); //失效期 expirationDate = new Date(expiration.longValue()); //失效期
} }
String batch = jsonMap.get("batch") != null ? jsonMap.get("batch").toString() : null; // 批次 String batch = jsonMap.get("batch") != null ? jsonMap.get("batch").toString() : null; // 批次
String wmsDetailId = jsonMap.get("wmsDetailId") != null ? jsonMap.get("wmsDetailId").toString() : null; // WMS分录id
String uniqueCode = jsonMap.get("uniqueCode") != null ? jsonMap.get("uniqueCode").toString() : null; // 商品编码 String uniqueCode = jsonMap.get("uniqueCode") != null ? jsonMap.get("uniqueCode").toString() : null; // 商品编码
String registrationCode = jsonMap.get("registrationCode") != null ? jsonMap.get("registrationCode").toString() : null; // 注册证号 String registrationCode = jsonMap.get("registrationCode") != null ? jsonMap.get("registrationCode").toString() : null; // 注册证号
String licenceCode = jsonMap.get("licenceCode") != null ? jsonMap.get("licenceCode").toString() : null; // 生产许可证号 String licenceCode = jsonMap.get("licenceCode") != null ? jsonMap.get("licenceCode").toString() : null; // 生产许可证号
@ -88,6 +89,7 @@ public class SaleOutBillConvertPlugin extends AbstractConvertPlugIn implements P
entry.set("producedate", manufactureDate); entry.set("producedate", manufactureDate);
entry.set("expirydate", expirationDate); entry.set("expirydate", expirationDate);
entry.set("lotnumber", batch); entry.set("lotnumber", batch);
entry.set("tqq9_wmsdetailid", wmsDetailId);
entry.set("tqq9_licenseno", licenceCode); entry.set("tqq9_licenseno", licenceCode);
entry.set("tqq9_registration", tqq9_registration); entry.set("tqq9_registration", tqq9_registration);
entry.set("tqq9_sccs", tqq9_proxyandfactory); entry.set("tqq9_sccs", tqq9_proxyandfactory);