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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
zzs 2025-01-16 10:09:57 +08:00
commit 26c5131e40
16 changed files with 147 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
font/fonts.properties/yxzg-topview-dev/simsun.ttc Normal file
View File

Binary file not shown.

18
src/main/java/com/yem/or/api/AssepcDynamic.java
View File

@ -118,7 +118,9 @@ public class AssepcDynamic {
JSONArray jsonArray = new JSONArray();
QFilter qFilter = new QFilter("createorg.number", QCP.equals, "110");
qFilter.and("status", QCP.equals, "C");
qFilter.and("yem_customer.number", QCP.equals, number);
if (!StringUtils.containsIgnoreCase(number, "admin")) {
qFilter.and("yem_customer.number", QCP.equals, number);
}
// qFilter.and("yem_billtype.number", QCP.equals, "yem_es_salesorder_ZJ");
String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles", false);
DynamicObjectCollection dynamicObjects = QueryServiceHelper.query("yem_em_devicefiles", selectfields
@ -447,8 +449,10 @@ public class AssepcDynamic {
@ApiPostMapping("/assepcdynamic/electronic_group")
public CustomApiResult<Object> queryElectronicGroup(@NotNull @ApiParam("客户.编码(116021200012)") String number) {
List<Map<String, Object>> result = new ArrayList<>();
QFilter qFilter = new QFilter("yem_customer.number", QCP.equals, number);
qFilter.and("status", QCP.equals, "C");
QFilter qFilter = new QFilter("status", QCP.equals, "C");
if (!StringUtils.containsIgnoreCase(number, "admin")) {
qFilter.and(new QFilter("yem_customer.number", QCP.equals, number));
}
String selectfields = DynamicObjectUtil.getSelectfields("yem_em_devicefiles");
DynamicObjectCollection load = ORM.create().query("yem_em_devicefiles", selectfields + ",id", qFilter.toArray());
for (DynamicObject dynamicObject : load) {
@ -667,7 +671,9 @@ public class AssepcDynamic {
public CustomApiResult<Object> queryBayedResourceNo(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) {
String algoKey = this.getClass().getName();
QFilter qFilter = new QFilter("status", "=", "C");
qFilter.and("yem_customer.number", "=", customerNo);
if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
qFilter.and("yem_customer.number", "=", customerNo);
}
qFilter.and("yem_model", "is not null", null);
ArrayList<String> list = Lists.newArrayList();
list.add("yem_model");
@ -799,7 +805,9 @@ public class AssepcDynamic {
public CustomApiResult<Object> queryProductModel(@NotBlank @ApiParam(value = "客户编码", example = "116021200012") String customerNo) {
String algoKey = this.getClass().getName();
QFilter qFilter = new QFilter("status", "=", "C");
qFilter.and("yem_customer.number", "=", customerNo);
if (!StringUtils.containsIgnoreCase(customerNo, "admin")) {
qFilter.and("yem_customer.number", "=", customerNo);
}
qFilter.and("group", "is not null", null);
ArrayList<String> list = Lists.newArrayList();
list.add("group.number number");

2
src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
View File

@ -55,7 +55,7 @@ public class SalesOfRoyaltyParts extends AbstractReportListDataPlugin {
.finish();
//CASE WHEN yem_es_materialinfo.yem_ifgift = '1' THEN (yem_es_materialinfo.yem_fobprice * yem_qty) ELSE yem_es_materialinfo.yem_afterfrontdisamt END yem_actualsalesamount
resDataSet = resDataSet.select(String.join(",",RptUtil.getDataSetFiledAlias(resDataSet))+
",CASE WHEN yem_ifgift = '1' THEN (yem_fobprice * yem_qty) ELSE (yem_afterfrontdisprice * yem_qty) END yem_actualsalesamount");
",CASE WHEN yem_ifgift = true THEN (yem_fobprice * yem_qty) ELSE (yem_afterfrontdisprice * yem_qty) END yem_actualsalesamount");
DataSet select = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(resDataSet)) +
",yem_actualsalesamount * yem_exchangerate yem_outboundamount" +
",CASE WHEN yem_salcontractclaamt >= yem_offeramount THEN claimstate ELSE '' END yem_payments" +

21
src/main/java/com/yem/wm/demo.java Normal file
View File

@ -0,0 +1,21 @@
package com.yem.wm;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.form.control.QRCode;
import java.util.EventObject;
/**
* @author zhouc
* @date 2024/8/30 19:04
* @className demo
* @description
*/
public class demo extends AbstractBillPlugIn {
@Override
public void afterBindData(EventObject e) {
super.afterBindData(e);
QRCode code = this.getView().getControl("yem_qrcodeap");
code.setUrl("https://www.baidu.com/");
}
}

32
src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
View File

@ -5,7 +5,6 @@ import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.YEM;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.BillEntityType;
import kd.bos.entity.ExtendedDataEntity;
import kd.bos.entity.botp.plugin.AbstractConvertPlugIn;
import kd.bos.entity.botp.plugin.args.AfterConvertEventArgs;
@ -29,37 +28,14 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
public void afterConvert(AfterConvertEventArgs e) {
super.afterConvert(e);
String targetName = this.getTgtMainType().getName();
BillEntityType srcMainType = this.getSrcMainType();
//上游
String name = this.getSrcMainType().getName();
ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
for (ExtendedDataEntity findByEntityKey : findByEntityKeys) {
// List<DynamicObject> shippingDetails = (List<DynamicObject>) findByEntityKey.getValue("ConvertSource");
DynamicObject dataEntity = findByEntityKey.getDataEntity();//单据主实体
// for (DynamicObject shippingDetail : shippingDetails) {
////
//// Long value = shippingDetail.getLong("id");
//// DynamicObject findBynames = BusinessDataServiceHelper.loadSingle(value, name);
//// MulBasedataDynamicObjectCollection yemDestport = (MulBasedataDynamicObjectCollection ) findByEntityKey.getValue("yem_shipports");
//// DynamicObjectCollection fourBookColls = new DynamicObjectCollection();
//// DynamicObject tempDyObjs = new DynamicObject(yemDestport.getDynamicObjectType());
//// tempDyObjs.set("fbasedataid",findBynames.getDynamicObject("yem_despportcodebase"));
//// fourBookColls.add(tempDyObjs);
//// dataEntity.set("yem_shipports", fourBookColls);
////
////
//// MulBasedataDynamicObjectCollection yemDestports = (MulBasedataDynamicObjectCollection ) findByEntityKey.getValue("yem_destports");
//// DynamicObjectCollection fourBookColl = new DynamicObjectCollection();
//// DynamicObject tempDyObj = new DynamicObject(yemDestports.getDynamicObjectType());
//// tempDyObj.set("fbasedataid",findBynames.getDynamicObject("yem_distinateportbase"));
//// fourBookColl.add(tempDyObj);
//// dataEntity.set("yem_destports", fourBookColl);
//
//
// }//携带合同中的佣金率
//携带合同中的佣金率
setRate(findByEntityKey);
DynamicObject dataEntity = findByEntityKey.getDataEntity();//单据主实体
bringLatestExRate(dataEntity);
DynamicObjectCollection yemExportinvoiceC = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c");//报关商品
DynamicObjectCollection yemExportinvoiceCd = dataEntity.getDynamicObjectCollection("yem_exportinvoice_cd");//报关商品对照表
@ -83,7 +59,7 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
BigDecimal yem_locamt = dynamicObject.getBigDecimal("yem_locamt");
dynamicObject2.set("yem_cusqty", yemCusqty.add(yemQty));
dynamicObject2.set("yem_cusamount", yem_sellamt.add(yem_cusamount));
dynamicObject2.set("yem_cusconsalesprice", BigDecimalUtils.div(yem_sellamt.add(yem_cusamount), yemCusqty.add(yemQty), 4));
dynamicObject2.set("yem_cusconsalesprice", BigDecimalUtils.div(yem_sellamt.add(yem_cusamount),yemCusqty.add(yemQty),4));
dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount));
// dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount));
}
@ -122,11 +98,9 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
calculatePremium(dataEntity);
}
ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
yemCushscode(findByname);
}
private void yemCushscode(ExtendedDataEntity[] findByname) {

26
src/main/java/com/yem/wm/es/encasement/dynamic/StuffingMessageFromPlugin.java
View File

@ -1,17 +1,15 @@
package com.yem.wm.es.encasement.dynamic;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.datamodel.events.ChangeData;
import kd.bos.entity.datamodel.events.PropertyChangedArgs;
import kd.bos.form.control.Control;
import kd.bos.form.control.EntryGrid;
import kd.bos.form.control.events.RowClickEventListener;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import java.math.BigDecimal;
import java.util.EventObject;
import java.util.HashMap;
@ -43,10 +41,6 @@ public class StuffingMessageFromPlugin extends AbstractBillPlugIn implements Row
DynamicObject dataEntity = this.getModel().getDataEntity(true);
DynamicObjectCollection dataEntitys=new DynamicObjectCollection();
DynamicObjectCollection dataEntityss=new DynamicObjectCollection();
EntryGrid entryGrid = this.getView().getControl("yem_backentry");
EntryGrid entryGridb = this.getView().getControl("yem_sumpartspack");
// int[] selectRows = entryGrid.getSelectRows();
// int[] selectRow = entryGridb.getSelectRows();
Map<Integer, Integer> map = new HashMap<Integer, Integer>();
Map<Integer, Integer> maps = new HashMap<Integer, Integer>();
DynamicObjectCollection yem_backentrys=dataEntity.getDynamicObjectCollection("yem_backentry");
@ -63,10 +57,6 @@ public class StuffingMessageFromPlugin extends AbstractBillPlugIn implements Row
DynamicObject backentry = this.getModel().getEntryRowEntity("yem_backentry",maps.get(i)-1);
dataEntitys.add(i,backentry);
}
// int rowIndex = this.getModel().getEntryCurrentRowIndex("yem_backentry");
DynamicObjectCollection yem_sumpartspacks=dataEntity.getDynamicObjectCollection("yem_sumpartspack");
int j=0;
for (DynamicObject yem_sumpartspack : yem_sumpartspacks) {
@ -77,22 +67,10 @@ public class StuffingMessageFromPlugin extends AbstractBillPlugIn implements Row
j++;
}
}
// for (int i=0; i < selectRows.length; i++) {
// DynamicObject backentry = this.getModel().getEntryRowEntity("yem_backentry",selectRows[i]);
// dataEntitys.add(i,backentry);
// }
// for (int i=0; i < selectRow.length; i++) {
// DynamicObject sumpartspack = this.getModel().getEntryRowEntity("yem_sumpartspack",selectRow[i]);
// dataEntityss.add(i,sumpartspack);
// }
for (int i = 0; i < map.size(); i++) {
DynamicObject sumpartspack = this.getModel().getEntryRowEntity("yem_sumpartspack",map.get(i)-1);
dataEntityss.add(i,sumpartspack);
}
DynamicObjectCollection[] dataEntit= new DynamicObjectCollection[]{dataEntitys, dataEntityss};
this.getView().returnDataToParent(dataEntit);

74
src/main/java/com/yem/wm/es/encasement/from/EncaseMentStuffingEdit.java
View File

@ -31,11 +31,9 @@ import java.util.EventObject;
* @description: 回填装柜信息 装箱单
* @date 2023/8/29
*/
public class EncaseMentStuffingEdit extends AbstractBillPlugIn
{
public class EncaseMentStuffingEdit extends AbstractBillPlugIn {
@Override
public void registerListener(EventObject e)
{
public void registerListener(EventObject e) {
// TODO Auto-generated method stub
//监听点击的行数
super.registerListener(e);
@ -44,14 +42,12 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
@Override
public void afterDoOperation(AfterDoOperationEventArgs afterDoOperationEventArgs)
{
public void afterDoOperation(AfterDoOperationEventArgs afterDoOperationEventArgs) {
super.afterDoOperation(afterDoOperationEventArgs);
}
@Override
public void itemClick(ItemClickEvent evt)
{
public void itemClick(ItemClickEvent evt) {
// TODO Auto-generated method stub
String key = evt.getItemKey();
// 判断是否为回填按钮
@ -70,14 +66,12 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
}
@Override
public void customEvent(CustomEventArgs e)
{
public void customEvent(CustomEventArgs e) {
// TODO Auto-generated method stub
super.customEvent(e);
}
private void showInfoForm(IFormView view, String classname)
{
private void showInfoForm(IFormView view, String classname) {
FormShowParameter showParameter = new FormShowParameter();
showParameter.setStatus(OperationStatus.ADDNEW);
showParameter.getOpenStyle().setShowType(ShowType.Modal);
@ -97,8 +91,7 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
/**
* 动态表单回填单据字段
*/
private void setInwardInfo(DynamicObjectCollection[] values)
{
private void setInwardInfo(DynamicObjectCollection[] values) {
DynamicObjectCollection yem_backentrys = values[0];
DynamicObjectCollection yem_sumpartspack = values[1];
@ -132,6 +125,8 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
}
}
// DynamicObjectCollection yem_sumpartspackss = yem_sumpartspack.getDynamicObjectCollection("yem_sumpartspack");
// int[] indexs = this.getModel().batchCreateNewEntryRow("yem_im_detaweight_dw", yem_sumpartspack.size());
for (DynamicObject yem_sumpartspacks : yem_sumpartspack) {
int index = this.getModel().createNewEntryRow("yem_im_detaweight_dw");
if (index != -1) {
@ -139,7 +134,10 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
this.getModel().setValue("yem_picnoz_det", yem_sumpartspacks.getString("yem_packname"), index);
this.getModel().setValue("yem_traynumber_det", yem_sumpartspacks.getString("yem_trayno"), index);
this.getModel().setValue("yem_boxnumber_det", yem_sumpartspacks.getString("yem_boxno"), index);
this.getModel().setValue("yem_packstyle_det", yem_sumpartspacks.getDynamicObject("yem_packtype"), index);
DynamicObject yemPacktype = yem_sumpartspacks.getDynamicObject("yem_packtype");
if (yemPacktype != null) {
this.getModel().setValue("yem_packstyle_det", yemPacktype.getLong("id"), index);
}
this.getModel().setValue("yem_pieces_det", yem_sumpartspacks.getBigDecimal("yem_piecenum"), index);
this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getBigDecimal("yem_sumvolume"), index);
@ -160,11 +158,44 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
this.getView().showMessage("请先录入装柜信息");
}
}
// if (indexs.length > 0) {
// for (int index : indexs) {
// if (index==0){
//
// }
// DynamicObject yem_sumpartspacks = yem_sumpartspack.get(index);
// this.getModel().setValue("yem_businesssort_dw", "P", index);
// this.getModel().setValue("yem_picnoz_det", yem_sumpartspacks.getString("yem_packname"), index);
// this.getModel().setValue("yem_traynumber_det", yem_sumpartspacks.getString("yem_trayno"), index);
// this.getModel().setValue("yem_boxnumber_det", yem_sumpartspacks.getString("yem_boxno"), index);
// DynamicObject yemPacktype = yem_sumpartspacks.getDynamicObject("yem_packtype");
// if (yemPacktype!=null){
// this.getModel().setValue("yem_packstyle_det", yemPacktype.getLong("id"), index);
// }
// this.getModel().setValue("yem_pieces_det", yem_sumpartspacks.getBigDecimal("yem_piecenum"), index);
// this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
// this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getBigDecimal("yem_sumvolume"), index);
// this.getModel().setValue("yem_partsid", yem_sumpartspacks.getString("yem_partsid"), index);
// this.getModel().setValue("yem_grossweightsumd", yem_sumpartspacks.getBigDecimal("yem_sumroughweight"), index);
// this.getModel().setValue("yem_volsum_det", yem_sumpartspacks.getString("yem_sumvolume"), index);
//
// BigDecimal stuffingpiece = (BigDecimal) this.getModel().getValue("yem_stuffingpiece", yem_sumpartspacks.getInt("seq") - 1);
// this.getModel().setValue("yem_stuffingpiece", stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum"))
// , yem_sumpartspacks.getInt("seq") - 1);
//
// BigDecimal quantity = (BigDecimal) this.getModel().getValue("yem_piecenum", yem_sumpartspacks.getInt("seq") - 1);
// this.getModel().setValue("yem_residuepiece",
// quantity.subtract(stuffingpiece.add(yem_sumpartspacks.getBigDecimal("yem_piecenum")))
// , yem_sumpartspacks.getInt("seq") - 1);
// if (index == -1) {
// this.getView().showMessage("请先录入装柜信息");
// }
// }
// }
}
@Override
public void closedCallBack(ClosedCallBackEvent closedCallBackEvent)
{
public void closedCallBack(ClosedCallBackEvent closedCallBackEvent) {
Object returnData = closedCallBackEvent.getReturnData();
//判断标识是否匹配，并验证返回值不为空，不验证返回值可能会报空指针
if (StringUtils.equals(closedCallBackEvent.getActionId(), "yem_im_encasement") && null != closedCallBackEvent.getReturnData()) {
@ -176,8 +207,7 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
}
@Override
public void beforeDeleteRow(BeforeDeleteRowEventArgs e)
{
public void beforeDeleteRow(BeforeDeleteRowEventArgs e) {
super.beforeDeleteRow(e);
int[] index = e.getRowIndexs();
EntryProp entryProp = e.getEntryProp();
@ -190,7 +220,7 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
DynamicObject encasement = BusinessDataServiceHelper.loadSingle("yem_im_encasement",
"yem_backentry.seq",
new QFilter[]{new QFilter("yem_backentry.id", QCP.equals, pillarsid),});
if(encasement != null){
if (encasement != null) {
DynamicObjectCollection encasements = encasement.getDynamicObjectCollection("yem_backentry");
DynamicObjectCollection backentrys = this.getView().getModel().getEntryEntity("yem_backentry");
for (DynamicObject encasementss : encasements) {
@ -212,14 +242,14 @@ public class EncaseMentStuffingEdit extends AbstractBillPlugIn
if ("P".equals(businesssort_dw)) {
BigDecimal pieces_det = (BigDecimal) this.getModel().getValue("yem_pieces_det", row);
String yemPartsid = (String) this.getModel().getValue("yem_partsid", row);
if ("".equals(yemPartsid)){
if ("".equals(yemPartsid)) {
continue;
}
Long partsid = Long.valueOf(yemPartsid);
DynamicObject encasement = BusinessDataServiceHelper.loadSingle("yem_im_encasement",
"yem_sumpartspack.seq",
new QFilter[]{new QFilter("yem_sumpartspack.id", QCP.equals, partsid)});
if (encasement!=null){
if (encasement != null) {
DynamicObjectCollection encasements = encasement.getDynamicObjectCollection("yem_sumpartspack");
DynamicObjectCollection sumpartspacks = this.getView().getModel().getEntryEntity("yem_sumpartspack");
for (DynamicObject encasementss : encasements) {

20
src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java
View File

@ -81,29 +81,25 @@ public class ExportInvoiceSaveOP extends AbstractOperationServicePlugIn {
String yemLadbillnum = dataEntitie.getString("yem_ladbillnum");//提单号
// queryString//合同号
DynamicObjectCollection yem_shipports = dataEntitie.getDynamicObjectCollection("yem_shipports");//起运港
if (!YEM.isEmpty(yem_shipports) && !yem_shipports.isEmpty()) {
if (yem_shipports != null) {
for (DynamicObject yemShipport : yem_shipports) {
if (yemShipport != null) {
String ssa = yemShipport.getDynamicObject("fbasedataid").getString("name");//起运港
yemShipports.append(ssa);
}
String ssa = yemShipport.getDynamicObject("fbasedataid").getString("name");//起运港
yemShipports.append(ssa);
}
}
DynamicObjectCollection yem_Destports = dataEntitie.getDynamicObjectCollection("yem_destports");//目的港
if (!YEM.isEmpty(yem_Destports) && !yem_Destports.isEmpty()) {
if (yem_Destports != null) {
for (DynamicObject yemShipport : yem_Destports) {
if (yemShipport != null) {
String string = yemShipport.getDynamicObject("fbasedataid").getString("name");
yemDestports.append(string);//目的港
}
String string = yemShipport.getDynamicObject("fbasedataid").getString("name");
yemDestports.append(string);//目的港
}
}
BigDecimal stripTrailingZeros = new BigDecimal(totalAmount.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", ""));
BigDecimal stripTrailingZeros1 = new BigDecimal(yemSeatransfee.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", ""));
BigDecimal stripTrailingZeros2 = new BigDecimal(yemInsurefee.toPlainString().replaceAll("0*$", "").replaceAll("\\.$", ""));
dataEntitie.set("yem_remark", yemTradeway + " 成交总额:" + yemSettlement + stripTrailingZeros + " 汇率:" + yemExrate.stripTrailingZeros()
+ "\r\n 海运费:" + yemseatransfeecurr + stripTrailingZeros1 + " 保险费:" + yeminsurefeecurr + stripTrailingZeros2
+ "\r\n 提单号:" + yemLadbillnum + "\r\n 合同号:" + queryString + "\r\n 起运港:" + yemShipports + "\r\n 目的港:" + yemDestports);
+ "\r\n 海运费:"+ yemseatransfeecurr + stripTrailingZeros1 + " 保险费:" + yeminsurefeecurr + stripTrailingZeros2
+ "\r\n 提单号:"+ yemLadbillnum + "\r\n 合同号:"+ queryString + "\r\n 起运港:" + yemShipports + "\r\n 目的港:" + yemDestports);
}
}
}

8
src/main/java/com/yem/wm/es/exportpresent/op/ExportPresentSubmitOp.java
View File

@ -7,6 +7,7 @@ import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.AddValidatorsEventArgs;
import kd.bos.entity.plugin.PreparePropertysEventArgs;
import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper;
@ -25,6 +26,10 @@ import static com.yem.wm.es.contractamtlist.util.FunUtil.getShipBills;
public class ExportPresentSubmitOp extends AbstractOperationServicePlugIn
{
public void onPreparePropertys(PreparePropertysEventArgs e) {
super.onPreparePropertys(e);
e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet());
}
@Override
public void onAddValidators(AddValidatorsEventArgs e)
{
@ -55,8 +60,7 @@ public class ExportPresentSubmitOp extends AbstractOperationServicePlugIn
BigDecimal thisRealityAmt = PaymentControlUtil.getThisRealityAmt(saleOrder, shipBills, payBills, shipDetail);
dynamicObject.set("yem_debtamt", thisRealityAmt.setScale(2, RoundingMode.HALF_UP));
}
String yemDetailordernumber = dataEntity.getString("yem_detailordernumber");
dataEntity.set("yem_cloudhousetitle","寄单放单申请-"+yemDetailordernumber);
dataEntity.set("yem_cloudhousetitle","标准出口交单-"+dataEntity.getString("billno") +"-"+ dataEntity.getString("yem_salarcontractnum") );
}
SaveServiceHelper.save(eDataEntities);
}

9
src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailSaveOp.java
View File

@ -2,27 +2,22 @@ package com.yem.wm.es.shippingdetails.op;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.kingdee.cosmic.ctrl.common.CtrlUtil;
import com.yem.wm.bc.companytitle.form.CompanyTitleEdit;
import com.yem.wm.es.Util.BoxTypeDataGen;
import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.YEM;
import kd.bos.dataentity.OperateOption;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.operate.result.OperationResult;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.PreparePropertysEventArgs;
import kd.bos.entity.plugin.args.EndOperationTransactionArgs;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.OperationServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
/**
* @author 张立攀

7
src/main/java/com/yem/wm/fm/gathering/from/GatheringEcit.java
View File

@ -84,11 +84,7 @@ public class GatheringEcit extends AbstractBillPlugIn implements BeforeF7SelectL
rowCount += receiptdetail.size();
}
if (rowCount > 0) {
view.setEnable(false, "yem_comegoman");
} else {
view.setEnable(true, "yem_comegoman");
}
view.setEnable(rowCount <= 0, "yem_comegoman");
}
@Override
@ -1248,7 +1244,6 @@ public class GatheringEcit extends AbstractBillPlugIn implements BeforeF7SelectL
}
if (result == MessageBoxResult.No) {
view.invokeOperation("refresh");
return;
}
}
}

2
src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java
View File

@ -134,7 +134,7 @@ public class DebCredNewAuditValidatorOp extends AbstractValidator {
DynamicObjectCollection data11 = null;
if (YEM.isNotEmpty(getaccamtusetype)) {
QFilter qFilter1 = new QFilter("yem_contracttype", QCP.equals, getaccamtusetype.getString("yem_billtype.number"));//合同类型
qFilter1.and(new QFilter("yem_accamtusetype", QCP.equals, getaccamtusetype.getString("yem_fundusetype")));
qFilter1.and(new QFilter("yem_accamtusetype", QCP.equals, getaccamtusetype.getString("yem_accamtusetype")));
qFilter1.and(new QFilter("yem_billbusstype.number", QCP.equals, getaccamtusetype.getString("yem_billbusstype.number")));
qFilter1.and(new QFilter("enable", QCP.equals, "1"));
String selectfield1 = DynamicObjectUtil.getSelectfields("yem_bd_credittypeconfig", false);

3
src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewUnAuditValidator.java
View File

@ -26,8 +26,7 @@ public class DebCredNewUnAuditValidator extends AbstractValidator {
BigDecimal bigDecimal = BigDecimal.ZERO;
String modifiedString = billno.substring(0, billno.length() - 4);
String substringed = billno.substring(billno.length() - 4);
DynamicObject[] loaded = BusinessDataServiceHelper.load("yem_debcrednote", "id,billno"
, new QFilter[]{new QFilter("billno", QCP.like, modifiedString + "%")});
DynamicObject[] loaded = BusinessDataServiceHelper.load("yem_debcrednote", "id,billno", new QFilter[]{new QFilter("billno", QCP.in, modifiedString + "%")});
for (DynamicObject dynamicObject : loaded) {
String dynamicObjectString = dynamicObject.getString("billno");
String substring = dynamicObjectString.substring(dynamicObjectString.length() - 4);

26
src/main/java/com/yem/wm/rpt/PaymentDetailsFormPlugIn.java Normal file
View File

@ -0,0 +1,26 @@
package com.yem.wm.rpt;
import kd.bos.bill.AbstractBillPlugIn;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.form.FormShowParameter;
import java.util.EventObject;
import java.util.Map;
/**
* @author zhouc
* @date 2024/6/18 12:15
* @className PaymentDetailsFormPlugIn
* @description 外汇来款明细表单插件
*/
public class PaymentDetailsFormPlugIn extends AbstractBillPlugIn {
@Override
public void afterBindData(EventObject e) {
super.afterBindData(e);
FormShowParameter showParameter = this.getView().getFormShowParameter();
Map<String, Object> customParas = showParameter.getCustomParams();
DynamicObject dataEntity = this.getModel().getDataEntity(true);
Object pkValue = dataEntity.getPkValue();
}
}

3
src/main/java/com/yem/wm/task/StoraGetransToDeviceFilesTask.java
View File

@ -35,8 +35,7 @@ public class StoraGetransToDeviceFilesTask extends AbstractTask {
long yemResourcescodeLong = yemResourcescode.getLong("id");
String yemEmDevicefiles = DynamicObjectUtil.getSelectfields("yem_em_devicefiles", false);
QFilter qFilter = new QFilter("yem_framenumber", QCP.equals, yemVehicleno);
qFilter.and("yem_model.id", QCP.equals, yemResourcescodeLong)
.and("billstatus", QCP.equals, "C");
qFilter.and("yem_model.id", QCP.equals, yemResourcescodeLong);
DynamicObject[] dynamicObjects = BusinessDataServiceHelper.load("yem_em_devicefiles", yemEmDevicefiles
, new QFilter[]{qFilter});
if (dynamicObjects.length > 0) {

18
src/main/java/kd/cosmic/Application.java
View File

@ -20,17 +20,17 @@ public class Application {
cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp");
////152
cosmic.setClusterNumber("yxzg-topview-dev");
cosmic.setTenantNumber("yxzg-topview-dev");
cosmic.setServerIP("10.64.112.152");
cosmic.setFileServerPathIPAndPort("", "");
cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
// cosmic.setClusterNumber("yxzg-topview-dev");
// cosmic.setTenantNumber("yxzg-topview-dev");
// cosmic.setServerIP("10.64.112.152");
// cosmic.setFileServerPathIPAndPort("", "");
// cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
System.setProperty("mq.debug.queue.tag", "wrxtest");
////134
// cosmic.setClusterNumber("yxzg-prod");
// cosmic.setTenantNumber("yxzg-prod");
// cosmic.setServerIP("10.64.111.134");
// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
cosmic.setClusterNumber("yxzg-prod");
cosmic.setTenantNumber("yxzg-prod");
cosmic.setServerIP("10.64.111.134");
cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
cosmic.setStartWithQing(false);
cosmic.start();