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

Merge remote-tracking branch 'origin/dev-zzs' into dev-zzs

Browse Source
This commit is contained in:
violet 2024-09-02 19:46:10 +08:00
commit ed3913face
6 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yem/em/ass/cmmptable/validator/CMMPTableAuditvalidator.java
View File

@ -26,7 +26,7 @@ public class CMMPTableAuditvalidator extends AbstractValidator {
this.addErrorMessage(dataEntitie, String.format("部件详情第【"+seq+"】行未匹配【系统编码】，请重试！"));
}
boolean yem_isassatlasdet = dynamicObject.getBoolean("yem_isassatlasdet");
if (!yemIsnormal) {
if (!yem_isassatlasdet) {
this.addErrorMessage(dataEntitie, String.format("部件详情第【"+seq+"】行未匹配【图册明细】，请重试！"));
}
}

3
src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java
View File

@ -53,7 +53,8 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
.on("salesorderid", "main_id_g_claimed_amt_fk")
.select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(claimedAmt))
.finish();
claimDate = claimDate.select("main_id_gathering_fk, yem_prodpaydate yem_firstpaydate, yem_endpaydate yem_lastpaydate");
claimDate = claimDate.select("main_id_gathering_fk, yem_endpaydate yem_lastpaydate, " +
"CASE WHEN yem_prodpaydate != '' THEN yem_prodpaydate ELSE yem_shippaydate END yem_firstpaydate");
resDataSet = resDataSet.leftJoin(claimDate)
.on("salesorderid", "main_id_gathering_fk")
.select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(claimDate))

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

@ -934,17 +934,17 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
DynamicObjectCollection infors = overAllToolLib.getDynamicObjectCollection("yem_infor");
DynamicObjectCollection spareparts = overAllToolLib.getDynamicObjectCollection("yem_spareparts");
DynamicObjectCollection tools = overAllToolLib.getDynamicObjectCollection("yem_tools");
// for (DynamicObject infor : infors) {
// int entryRow = model.createNewEntryRow("yem_es_salesorder_p");
// model.setValue("yem_accessorytype", overAllToolLib.getDynamicObject("yem_productmodel"), entryRow);
// model.setValue("yem_volvotype", "A", entryRow);
// model.setValue("yem_accesmaterial", infor.getDynamicObject("yem_material_i"), entryRow);
// model.setValue("yem_acunit", infor.getDynamicObject("yem_unit_i"), entryRow);
// model.setValue("yem_bicycleqty", infor.getBigDecimal("yem_qty_i"), entryRow);
// model.setValue("yem_acremark", infor.getString("yem_remark_i"), entryRow);
// model.setValue("yem_pcstype", map.get(id), entryRow);
// model.setValue("yem_acallqty", map.get(id).multiply(infor.getBigDecimal("yem_qty_i")), entryRow);
// }
for (DynamicObject infor : infors) {
int entryRow = model.createNewEntryRow("yem_es_salesorder_p");
model.setValue("yem_accessorytype", overAllToolLib.getDynamicObject("yem_productmodel"), entryRow);
model.setValue("yem_volvotype", "A", entryRow);
model.setValue("yem_accesmaterial", infor.getDynamicObject("yem_material_i"), entryRow);
model.setValue("yem_acunit", infor.getDynamicObject("yem_unit_i"), entryRow);
model.setValue("yem_bicycleqty", infor.getBigDecimal("yem_qty_i"), entryRow);
model.setValue("yem_acremark", infor.getString("yem_remark_i"), entryRow);
model.setValue("yem_pcstype", map.get(id), entryRow);
model.setValue("yem_acallqty", map.get(id).multiply(infor.getBigDecimal("yem_qty_i")), entryRow);
}
for (DynamicObject sparepart : spareparts) {
int entryRow = model.createNewEntryRow("yem_es_salesorder_p");
model.setValue("yem_accessorytype", overAllToolLib.getDynamicObject("yem_productmodel"), entryRow);

2
src/main/java/com/yem/wm/es/storagetrans/dynamic/BackFillbillEdit.java
View File

@ -45,6 +45,7 @@ public class BackFillbillEdit extends AbstractFormPlugin {
model.setValue("yem_encasemedate", parentModel.getValue("yem_encasemedate"));//预计装箱时间
model.setValue("yem_cfscompnay", parentModel.getValue("yem_cfscompnay"));//货代公司
model.setValue("yem_cfscompnaytxt", parentModel.getValue("yem_cfscompnaytxt"));//货代公司
model.setValue("yem_custombrokers", parentModel.getValue("yem_custombrokers"));//报关行
model.setValue("yem_bhd_combo", parentModel.getValue("yem_bhd_combo"));//运费承付
model.setValue("yem_boxtext", parentModel.getValue("yem_boxvolume1"));//箱型箱量
@ -173,6 +174,7 @@ public class BackFillbillEdit extends AbstractFormPlugin {
Map map = new HashMap();
map.put("yem_encasemedate", model.getValue("yem_encasemedate"));//预计装箱时间
map.put("yem_cfscompnay", model.getValue("yem_cfscompnay"));//货代公司
map.put("yem_cfscompnaytxt", model.getValue("yem_cfscompnaytxt"));//货代公司
map.put("yem_custombrokers", model.getValue("yem_custombrokers"));//报关行
map.put("yem_bhd_combo", model.getValue("yem_bhd_combo"));//运费承付
map.put("yem_boxtext", model.getValue("yem_boxtext"));//箱型箱量

35
src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java
View File

@ -108,7 +108,8 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
String yemVoyageno = (String) this.getModel().getValue("yem_voyageno");//航次
Date yemCutdate = (Date) this.getModel().getValue("yem_cutdate");//截单日期
Date yemPortinterception = (Date) this.getModel().getValue("yem_portinterception");//截港日期
DynamicObject yemCfscompnay = (DynamicObject) this.getModel().getValue("yem_cfscompnay");//货代公司
// DynamicObject yemCfscompnay = (DynamicObject) this.getModel().getValue("yem_cfscompnay");//货代公司
String yemCfscompnay = (String) this.getModel().getValue("yem_cfscompnaytxt");//货代公司
Date yemEtddate = (Date) this.getModel().getValue("yem_etddate");//ETD(离港日期）
DynamicObject yemSctcompnayname = (DynamicObject) this.getModel().getValue("yem_sctcompnayname");//船公司
String yemStation = (String) this.getModel().getValue("yem_stationtext");//场站
@ -153,7 +154,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
boonle = false;
i++;
}
if (null == yemCfscompnay) {
if (YEM.isEmpty(yemCfscompnay)) {
string = string + i + ". 货代公司为空，请稍后重试！\n";
boonle = false;
i++;
@ -190,14 +191,14 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
boonle = false;
i++;
}
if (null == yemCfscompnay) {
if (YEM.isEmpty(yemCfscompnay)) {
string = string + i + ". 货代公司为空，请稍后重试！\n";
boonle = false;
i++;
}
}
if ("YSFS-1001".equals(number) || "YSFS-1002".equals(number)) {
if (null == yemCfscompnay) {
if (YEM.isEmpty(yemCfscompnay)) {
string = string + i + ". 货代公司为空，请稍后重试！\n";
boonle = false;
i++;
@ -251,7 +252,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
boonle = false;
i++;
}
if (null == yemCfscompnay) {
if (YEM.isEmpty(yemCfscompnay)) {
string = string + i + ". 货代公司为空，请稍后重试！\n";
boonle = false;
i++;
@ -288,17 +289,17 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
boonle = false;
i++;
}
if (yemCutdate == null) {
string = string + i + ". 截单日期为空，请稍后重试！\n";
boonle = false;
i++;
}
if (yemPortinterception == null) {
string = string + i + ". 截港日期为空，请稍后重试！\n";
boonle = false;
i++;
}
if (null == yemCfscompnay) {
// if (yemCutdate == null) {
// string = string + i + ". 截单日期为空，请稍后重试！\n";
// boonle = false;
// i++;
// }
// if (yemPortinterception == null) {
// string = string + i + ". 截港日期为空，请稍后重试！\n";
// boonle = false;
// i++;
// }
if (YEM.isEmpty(yemCfscompnay)) {
string = string + i + ". 货代公司为空，请稍后重试！\n";
boonle = false;
i++;
@ -349,6 +350,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
DynamicObject yem_customer = dataEntity.getDynamicObject("yem_customer");
model.setValue("yem_encasemedate", map.get("yem_encasemedate"));//预计装箱时间
model.setValue("yem_cfscompnay", map.get("yem_cfscompnay"));//货代公司
model.setValue("yem_cfscompnaytxt", map.get("yem_cfscompnaytxt"));//货代公司
model.setValue("yem_custombrokers", map.get("yem_custombrokers"));//报关行
model.setValue("yem_bhd_combo", map.get("yem_bhd_combo"));//运费承付
// model.setValue("yem_boxtext", map.get("yem_boxtext"));//箱型箱量
@ -458,6 +460,7 @@ public class StorageTransEdit_wl extends AbstractBillPlugIn {
if (storagetrans != null) {
storagetrans.set("yem_encasemedate", map.get("yem_encasemedate"));//预计装箱时间
storagetrans.set("yem_cfscompnay", map.get("yem_cfscompnay"));//货代公司
storagetrans.set("yem_cfscompnaytxt", map.get("yem_cfscompnaytxt"));//货代公司
storagetrans.set("yem_custombrokers", map.get("yem_custombrokers"));//报关行
storagetrans.set("yem_bhd_combo", map.get("yem_bhd_combo"));//运费承付
storagetrans.set("yem_boxtexts", map.get("yem_boxtext"));//箱型箱量

7
src/main/java/com/yem/wm/im/servicerepair/form/ServiceRepairFormPlugin.java
View File

@ -4,6 +4,8 @@ import com.google.common.collect.Maps;
import com.yem.wm.utils.FunctionalCommon;
import com.yem.wm.utils.YEM;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.entity.datamodel.IDataModel;
import kd.bos.extplugin.sample.AbstractFormPlugin;
import kd.bos.form.CloseCallBack;
import kd.bos.form.FormShowParameter;
@ -12,6 +14,7 @@ import kd.bos.form.ShowType;
import kd.bos.form.events.BeforeDoOperationEventArgs;
import kd.bos.form.events.ClosedCallBackEvent;
import kd.bos.form.operate.FormOperate;
import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.util.HashMap;
@ -42,8 +45,10 @@ public class ServiceRepairFormPlugin extends AbstractBillPlugIn {
super.closedCallBack(e);
IFormView view = this.getView();
String actionId = e.getActionId();
IDataModel model = this.getModel();
DynamicObject dataEntity = model.getDataEntity(true);
if ("voidreason".equals(actionId)) {
view.invokeOperation("save");
SaveServiceHelper.save(new DynamicObject[]{dataEntity});
view.invokeOperation("refresh");
}
}