目视单增加车型备注

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<MesCustomerCarModel> carModelList = mesCustomerCarModelRepository.findByHqlTopWhere(ddlPackBean, 1);
+        if (carModelList != null && !carModelList.isEmpty()){
+            return carModelList.get(0).getRemark();
+        }
+        return "";
+    }
     private List<MesWorkOrderAssembly> getAssemblyList(String workCenterCode, String vehicleNo, List<MesWorkOrderPart> workOrderPartList, MesPartProdGroup mesPartProdGroup) {
         //TM_BAS_WORK_ORDER_ASSEMBLY_SETTING 对应  mes_prod_rule_sort_cfg 排序生产规则