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

fix:

Browse Source 
1.整机发货明细表
This commit is contained in:
ljw 2024-11-22 18:48:03 +08:00
parent 883027d7c6
commit f35fdecc63
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
View File

@ -46,7 +46,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
DataSet declaredocx = queryDeclareDocx(param); DataSet declaredocx = queryDeclareDocx(param);
dataSet = dataSet.leftJoin(declaredocx) dataSet = dataSet.leftJoin(declaredocx)
.on("main_detail_id", "main_detail_id_declaredocx_fk") .on("yem_dnbillno", "main_detail_id_declaredocx_fk")
.select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx)) .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(declaredocx))
.finish(); .finish();
@ -577,10 +577,13 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
private DataSet queryDeclareDocx(ReportQueryParam param) { private DataSet queryDeclareDocx(ReportQueryParam param) {
QFilter qFilter = getBaseQFilter(new String[]{"B", "C"}); QFilter qFilter = getBaseQFilter(new String[]{"B", "C"});
ArrayList<String> selectfields = Lists.newArrayList(); ArrayList<String> selectfields = Lists.newArrayList();
selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk"); // selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk");
selectfields.add("yem_es_materialinfo.yem_sgnenumber main_detail_id_declaredocx_fk");
selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期 selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期
return ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray()); DataSet yemEsDeclaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
yemEsDeclaredocx = yemEsDeclaredocx.distinct();
return yemEsDeclaredocx;
} }
/** /**

15
src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java
View File

@ -1,12 +1,9 @@
package com.yem.wm.es.xsalesorder.from; package com.yem.wm.es.xsalesorder.from;
import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.FunctionalCommon;
import com.yem.wm.utils.YEM;
import kd.bos.bill.AbstractBillPlugIn; import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.botp.runtime.BFRow;
import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.IDataModel;
import kd.bos.entity.datamodel.RowDataEntity; import kd.bos.entity.datamodel.RowDataEntity;
import kd.bos.entity.datamodel.events.AfterAddRowEventArgs; import kd.bos.entity.datamodel.events.AfterAddRowEventArgs;
@ -17,10 +14,8 @@ import kd.bos.form.events.AfterDoOperationEventArgs;
import kd.bos.orm.query.QCP; import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter; import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.botp.BFTrackerServiceHelper;
import java.util.EventObject; import java.util.EventObject;
import java.util.List;
/** /**
* @author zhouc * @author zhouc
@ -125,9 +120,9 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn {
} }
} }
@Override // @Override
public void afterCreateNewData(EventObject e) { // public void afterCreateNewData(EventObject e) {
super.afterCreateNewData(e); // super.afterCreateNewData(e);
this.getModel().setValue("yem_signdate",new Date()); // this.getModel().setValue("yem_signdate",new Date());
} // }
} }