diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java index 7bb47f91..c8f51aca 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeAssAuditOpEdit.java @@ -4,6 +4,7 @@ import com.yem.em.utils.AtlasUtils; import com.yem.wm.im.delivernotice.utils.DeliverNoticeUtilsEdit; import com.yem.wm.utils.RequestCmmp; import com.yem.wm.utils.StringUtils; +import com.yem.wm.utils.YEM; import kd.bos.dataentity.OperateOption; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; @@ -149,7 +150,11 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn dynamicObject.set("yem_enginecode", submaterialinfo.getString("yem_engineno")); dynamicObject.set("yem_enginemodel", submaterialinfo.getString("yem_enginemodel")); dynamicObject.set("yem_enginevendor", submaterialinfo.getString("yem_enginevendor")); - dynamicObject.set("yem_dateofpurchase", getdateofpurchase(materialinfo.getString("yem_conbillnumber")));//订单日期 + DynamicObject order = querySalesOrder(materialinfo.getString("yem_conbillnumber")); + if (YEM.isNotEmpty(order)) { + dynamicObject.set("yem_dateofpurchase", order.getDate("yem_signdate"));//订单日期 + dynamicObject.set("yem_ordercustomer", order.get("yem_customer"));//合同客户 + } dynamicObject.set("yem_heqty", yem_qty);//数量 if (yemResourcescode != null) { @@ -213,6 +218,13 @@ public class DeliverNoticeAssAuditOpEdit extends AbstractOperationServicePlugIn return null; } + public DynamicObject querySalesOrder(String billno) { + QFilter qFilter = new QFilter("billno", QCP.equals, billno);//替换零件编码 + return BusinessDataServiceHelper.loadSingle("yem_es_salesorder", + "id,yem_signdate,yem_customer" + , new QFilter[]{qFilter}); + } + //获取整机上线时间 public Date Getmachinedata(String yem_framenumber, DynamicObject yemResourcescode) { String Queryfield = AtlasUtils.Queryfield("PLAN_PIN", "INSTRUCTION_CODE", "JOB_TIME", "INSTRUCTION_NAME");