From 66db54816cc4fd31db5693d819aee4d3756a56be Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 18 Nov 2024 18:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E8=A7=86=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesCreateWorkOrderImpl.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index 8fef368..f0136f8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -85,6 +85,9 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { @Autowired private MesPartPtrDetailRepository partPtrDetailRao; + @Autowired + private MesCustomerCarModelRepository mesCustomerCarModelRepository; + @Transactional(propagation = Propagation.REQUIRES_NEW) public void createWorkOrder(MesPartProdGroup partProdGroup, MesPartProdGroupDetail mesPartProdGroupDetail, MesPartSap partSap, MesCustSortInfo sortInfo,Long productSeq) { @@ -449,7 +452,11 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { }else { mesWorkOrder.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.N.getValue()); } - mesWorkOrder.setDescription(descriptionStr.toString()); + + //获取车型remark用于目视单打印 + String remark = getCarRemark(partProdGroup.getCustCode(),mesWorkOrder.getCarModelCode(),partProdGroup.getOrganizeCode()); + mesWorkOrder.setDescription(descriptionStr.append(remark).toString()); + /** * 工单号修改 * {ORG}{dynamicRule}{dynamicRule}{dynamicrule}{serialNo} @@ -545,6 +552,17 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { mesProduceSnRao.insert(mesProduceSn); } } + + private String getCarRemark(String custCode,String carModelCode,String organizeCode){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(custCode,"custCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(carModelCode,"carModelCode",ddlPackBean); + List carModelList = mesCustomerCarModelRepository.findByHqlTopWhere(ddlPackBean, 1); + if (carModelList != null && !carModelList.isEmpty()){ + return carModelList.get(0).getRemark(); + } + return ""; + } private List getAssemblyList(String workCenterCode, String vehicleNo, List workOrderPartList, MesPartProdGroup mesPartProdGroup) { //TM_BAS_WORK_ORDER_ASSEMBLY_SETTING 对应 mes_prod_rule_sort_cfg 排序生产规则