批量报工，条码生成规则和批量打印功能保持一致

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -973,7 +973,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         }
         mesWorkOrderDb.setCompleteQty(mesWorkOrderDb.getReportedQty());
         mesWorkOrderDb.setRemark(mesWorkOrder.getRemark());
-        String sn = getOrderNo(mesWorkOrder);
+        String sn = getOrderNo(mesWorkOrder,mesPart,userName);
         //更新工单
         updateMesWorkOrder(mesWorkOrderDb,userName);
         //记录条码表&加工记录表
@@ -1186,10 +1186,9 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         return  DateUtil.parse(dateStr, (DateParser) DatePattern.NORM_DATETIME_FORMAT);
     }
 
-    private String getOrderNo(MesWorkOrder mesWorkOrder) {
-        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.REPORT_SN);
-        List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel.organizeCode(mesWorkOrder.getOrganizeCode()), mesWorkOrder.getCreateUser(), mesWorkOrder.getOrganizeCode(), 1).getResultList();
-        return resultList.iterator().next();
+    private String getOrderNo(MesWorkOrder mesWorkOrder,MesPart mesPart,String userName) {
+        if (StringUtils.isEmpty(mesPart.getProductMatchRule())) MesPcnException.throwMesBusiException("请检查零件信息,零件[%s]信息未维护零件条码编码规则!", mesPart.getPartNo());
+        return syncFuncService.syncSerialNo(new GenSerialNoModel(mesPart.getProductMatchRule()).prodLocation(mesWorkOrder.getWorkCenterCode()).partNo(mesPart.getPartNo()).putDataMap(MesPart.class.getSimpleName(), mesPart).organizeCode(mesPart.getOrganizeCode()), userName, mesWorkOrder.getOrganizeCode(), 1).getResultList().get(0).toString();
     }
 
     private MesProductOffLine creatMesProductOffLine(MesWorkOrder mesWorkOrder, MesProductVersion mesProductVersion,
@@ -1236,6 +1235,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         mesProduceSn.setLotNo(TimeTool.getToday());
         mesProduceSn.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
         mesProduceSn.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
+        mesProduceSn.setAreaCode(mesWorkOrder.getAreaCode());
         mesProduceSn.setPrintCount(MesPcnExtConstWords.ONE);
         mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue());
         mesProduceSn.setOrganizeCode(mesPart.getOrganizeCode());