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

fix:

Browse Source 
1.装箱单效验
2.发运明细审核效验
This commit is contained in:
ljw 2024-10-31 20:48:07 +08:00
parent 21316e6fe9
commit ce36ea9758
2 changed files with 317 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/yem/wm/es/encasement/from/EncaseMentEdit.java
View File

@ -150,13 +150,23 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
deleteEntryRow();
break;
case "statusconvertpjqr":
String yemWeightconfirmed = (String) this.getModel().getValue("yem_weightconfirmed");
if (!yemWeightconfirmed.isEmpty()) {
lockAccessoriesPackaging(false);
} else {
this.getView().showMessage("锁定重量是否确认为空！！！");
}
break;
case "statusconvertpjfqr":
lockAccessoriesPackaging(true);
break;
case "statusconvertqrzj":
String yemWeightconfirmeds = (String) this.getModel().getValue("yem_weightconfirmed");
if (!yemWeightconfirmeds.isEmpty()) {
lockRemovable(false);
} else {
this.getView().showMessage("锁定重量是否确认为空！！！");
}
break;
case "statusconvertfqrzj":
lockRemovable(true);
@ -175,7 +185,8 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
IDataModel model = this.getModel();
DynamicObject dataEntity = model.getDataEntity(true);
if ("statusconvertpjqr".equals(operateKey) || "statusconvertqrzj".equals(operateKey)) {
String yemWeightconfirmed = (String) this.getModel().getValue("yem_weightconfirmed");
if (!yemWeightconfirmed.isEmpty()) {
DynamicObjectCollection collection = dataEntity.getDynamicObjectCollection("yem_im_packinginfor_pi");
StringBuilder sb = new StringBuilder();
for (DynamicObject dynamicObject : collection) {
@ -268,6 +279,9 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
} else {
doConfirm(operateKey);
}
} else {
this.getView().showMessage("锁定重量是否确认为空！！！");
}
}
IFormView view = this.getView();
@ -344,19 +358,24 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
SaveServiceHelper.save(new DynamicObject[]{dynamicObject});
long currentUserId = YEM.getCurrentUserId();
DynamicObject user = BusinessDataServiceHelper.loadSingle(currentUserId, "bos_user");
String yemWeightconfirmed = (String) this.getModel().getValue("yem_weightconfirmed");
if (!yemWeightconfirmed.isEmpty()) {
if ("statusconvertpjqr".equals(operateKey)) {
dataEntity.set("yem_completionstatuspj", "B");
dataEntity.set("yem_affirmmanpj", user);
dataEntity.set("yem_affirmdatepj", new Date());
}
if ("statusconvertqrzj".equals(operateKey)) {
dataEntity.set("yem_completionstatuszj", "B");
dataEntity.set("yem_affirmmanzj", user);
dataEntity.set("yem_affirmdatezj", new Date());
}
} else {
this.getView().showMessage("锁定重量是否确认为空！！！");
}
SaveServiceHelper.save(new DynamicObject[]{dataEntity});
this.getView().invokeOperation("refresh");
this.getView().showSuccessNotification("确认完成");
@ -413,7 +432,12 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
if (MessageBoxResult.Yes.equals(result)) {
if ("statusconvertpjqr".equals(callBackId) || "statusconvertqrzj".equals(callBackId)) {
String yemWeightconfirmed = (String) this.getModel().getValue("yem_weightconfirmed");
if (!yemWeightconfirmed.isEmpty()) {
doConfirm(callBackId);
} else {
this.getView().showMessage("锁定重量是否确认为空！！！");
}
}
}
}

23
src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailsAuditOp.java
View File

@ -3,9 +3,11 @@ package com.yem.wm.es.shippingdetails.op;
import com.alibaba.csp.sentinel.util.StringUtil;
import com.yem.wm.es.contractamtlist.util.FunUtil;
import com.yem.wm.es.shippingdetails.util.PaymentControlUtil;
import com.yem.wm.es.shippingdetails.validator.ShippingDetailsAuditValidator;
import com.yem.wm.utils.YEM;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.ExtendedDataEntity;
import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
import kd.bos.entity.plugin.AddValidatorsEventArgs;
import kd.bos.entity.plugin.PreparePropertysEventArgs;
@ -33,7 +35,7 @@ public class ShippingDetailsAuditOp extends AbstractOperationServicePlugIn {
@Override
public void onAddValidators(AddValidatorsEventArgs e) {
super.onAddValidators(e);
// e.addValidator(new ShippingDetailAuditValidator());
// e.addValidator(new ShippingDetailsAuditValidator());
}
@Override
@ -43,6 +45,25 @@ public class ShippingDetailsAuditOp extends AbstractOperationServicePlugIn {
dataEntitie = BusinessDataServiceHelper.loadSingle(dataEntitie.getPkValue(), dataEntitie.getDynamicObjectType().getName());
collect(dataEntitie);
arrearsAmt(dataEntitie);
// if (dataEntitie.getDynamicObjectType().getName().equals("yem_xshippingdetails")) {
// DynamicObjectCollection yemEsSalesorderTotal = dataEntitie.getDynamicObjectCollection("yem_es_salesorder_total");
// if (!yemEsSalesorderTotal.isEmpty()) {
// for (DynamicObject dynamicObject : yemEsSalesorderTotal) {
// BigDecimal yemQtyTl = dynamicObject.getBigDecimal("yem_qty_tl");
// BigDecimal yemAllocateqtyTl = dynamicObject.getBigDecimal("yem_allocateqty_tl");
// int i = dynamicObject.getInt("seq");
// String yemAccesmaterial = dynamicObject.getString("yem_accesmaterial_tl.name");
// boolean yemIsgifitTl = dynamicObject.getBoolean("yem_isgifit_tl");
//
// if (yemQtyTl.compareTo(yemAllocateqtyTl) < 0&&!yemIsgifitTl&&) {
// this.getOperationResult().setSuccess(true);
// this.getOperationResult().setMessage("出运汇总页签，第" + i + "行物料" + yemAccesmaterial + "，已调数量" + yemQtyTl + "，出运数量" + yemAllocateqtyTl + "，不允许审核，请修改调拨后处理！"); // 提示内容
// this.getOperationResult().setShowMessage(true); // 是否显示提示消息
// }
// }
// }
// }
SaveServiceHelper.save(new DynamicObject[]{dataEntitie});
}
}