violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' into dev-ljw

Browse Source
This commit is contained in:
ljw 2024-09-24 14:35:47 +08:00
commit 14ce43f2eb
3 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/yem/ia/intebilllogon/commom/CommonUtils.java
View File

@ -301,25 +301,27 @@ public class CommonUtils {
if (fileurl.contains("http://localhost:8080/ierp/")) { if (fileurl.contains("http://localhost:8080/ierp/")) {
fileurl = fileurl.replace("http://localhost:8080/", "http://10.64.112.152:8022/"); fileurl = fileurl.replace("http://localhost:8080/", "http://10.64.112.152:8022/");
} }
if (yem_ispdf && filename.endsWith(".pdf")) { if (yem_ispdf) {
String result = YunzhijiaUtils.uploadfile(fileurl, accessToken, (String) map.get("name")); if (filename.endsWith(".pdf")) {
JSONObject json = JSONObject.parseObject(result); String result = YunzhijiaUtils.uploadfile(fileurl, accessToken, (String) map.get("name"));
Boolean success = json.getBoolean("success"); JSONObject json = JSONObject.parseObject(result);
if (success) { Boolean success = json.getBoolean("success");
JSONArray data = json.getJSONArray("data"); if (success) {
for (int j = 0; j < data.size(); j++) { JSONArray data = json.getJSONArray("data");
JSONObject object = new JSONObject(); for (int j = 0; j < data.size(); j++) {
JSONObject jsonObject = data.getJSONObject(j); JSONObject object = new JSONObject();
if (jsonObject != null) { JSONObject jsonObject = data.getJSONObject(j);
if (jsonObject != null) {
// object.put("fileName", jsonObject.getString("fileName")); // object.put("fileName", jsonObject.getString("fileName"));
object.put("fileName", map.get("name").toString()); object.put("fileName", map.get("name").toString());
object.put("fileId", jsonObject.getString("fileId")); object.put("fileId", jsonObject.getString("fileId"));
object.put("fileSize", jsonObject.getString("length")); object.put("fileSize", jsonObject.getString("length"));
object.put("fileType", jsonObject.getString("fileType")); object.put("fileType", jsonObject.getString("fileType"));
object.put("fileExt", map.get("type").toString()); object.put("fileExt", map.get("type").toString());
jsonArray.add(object); jsonArray.add(object);
//创建ERP与云之家对照表 //创建ERP与云之家对照表
Addattyunzhijia(formId, pkId, map, attachKey, jsonObject); Addattyunzhijia(formId, pkId, map, attachKey, jsonObject);
}
} }
} }
} }

2
src/main/java/com/yem/wm/es/salescontrac/op/SalesContracSignatureOp.java
View File

@ -146,7 +146,7 @@ public class SalesContracSignatureOp extends AbstractOperationServicePlugIn {
public JSONObject GetintebilllogonJson(Object pkid, DynamicObject dynamicObject) { public JSONObject GetintebilllogonJson(Object pkid, DynamicObject dynamicObject) {
JSONObject Object = new JSONObject(); JSONObject Object = new JSONObject();
QFilter qFilter = new QFilter("yem_isdisable", QCP.equals, false); QFilter qFilter = new QFilter("yem_isdisable", QCP.equals, false);
qFilter.and(new QFilter("billno", QCP.equals, "WXHT-YZJ")); qFilter.and(new QFilter("billno", QCP.equals, "KJHT-GZSP"));
DynamicObject yem_ia_intebilllogon = BusinessDataServiceHelper.loadSingle("yem_ia_intebilllogon", "id", qFilter.toArray()); DynamicObject yem_ia_intebilllogon = BusinessDataServiceHelper.loadSingle("yem_ia_intebilllogon", "id", qFilter.toArray());
if (yem_ia_intebilllogon != null) { if (yem_ia_intebilllogon != null) {
long intebilllogonID = yem_ia_intebilllogon.getLong("id"); long intebilllogonID = yem_ia_intebilllogon.getLong("id");

27
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
View File

@ -87,7 +87,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
OperationStatus status = fsp.getStatus(); OperationStatus status = fsp.getStatus();
String formId = fsp.getFormId(); String formId = fsp.getFormId();
String appId = fsp.getAppId(); String appId = fsp.getAppId();
if (OperationStatus.ADDNEW == status&&appId.equals("yem_es")) { if (OperationStatus.ADDNEW == status && appId.equals("yem_es")) {
SplitContainer splitContainer = this.getControl("yem_splitcontainerap"); SplitContainer splitContainer = this.getControl("yem_splitcontainerap");
splitContainer.setCollapse("yem_splitpanelap1", true); splitContainer.setCollapse("yem_splitpanelap1", true);
QFilter qFilter = null; QFilter qFilter = null;
@ -193,6 +193,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
String name = e.getProperty().getName(); String name = e.getProperty().getName();
ChangeData changeData = e.getChangeSet()[0]; ChangeData changeData = e.getChangeSet()[0];
Object oldValue = changeData.getOldValue(); Object oldValue = changeData.getOldValue();
Object newValue = changeData.getNewValue();
int rowIndex = changeData.getRowIndex(); int rowIndex = changeData.getRowIndex();
int ParentRow = changeData.getParentRowIndex(); int ParentRow = changeData.getParentRowIndex();
DynamicObject dataEntity = model.getDataEntity(); DynamicObject dataEntity = model.getDataEntity();
@ -526,10 +527,30 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
break; break;
case "yem_tonsqty": case "yem_tonsqty":
case "yem_port": case "yem_port":
case "yem_padexpense": case "yem_shippingmethod":
ClientUtils.calcInlandTransportationAmt(model, rowIndex);//计算内陆运费 ClientUtils.calcInlandTransportationAmt(model, rowIndex);//计算内陆运费
ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费 ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费
break; break;
case "yem_padexpense":
DynamicObject padexpense = (DynamicObject) newValue;
if (padexpense != null) {
String number = padexpense.getString("number");
//内陆运输费
if ("FYXM0023.11".equals(number)) {
DynamicObjectCollection entryRows = this.getModel().getEntryEntity("yem_es_materialinfo");
for(int i = 0;i<entryRows.size();i++){
ClientUtils.calcInlandTransportationAmt(model, i);//计算内陆运费
}
}
//港杂费
else if ("FYXM0023.6".equals(number)) {
DynamicObjectCollection entryRows = this.getModel().getEntryEntity("yem_es_materialinfo");
for(int i = 0;i<entryRows.size();i++){
ClientUtils.calculatePortAmt(model, i);//计算内陆运费
}
}
}
break;
case "yem_squareqty": case "yem_squareqty":
ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费 ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费
break; break;
@ -570,6 +591,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
/** /**
* 选择赠送配件-产品机型，汇总明细信息中相同机型的数量 * 选择赠送配件-产品机型，汇总明细信息中相同机型的数量
*
* @param rowIndex * @param rowIndex
*/ */
private void summarizeModules(int rowIndex) { private void summarizeModules(int rowIndex) {
@ -598,6 +620,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
/** /**
* 修改商品明细中数量，同步修改礼品赠送中数量 * 修改商品明细中数量，同步修改礼品赠送中数量
*
* @param model * @param model
* @param rowIndex * @param rowIndex
*/ */