44517 装箱防错后吐条码需求（芜湖）

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackageProgressService.java

@@ -3,8 +3,8 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.method.IMesPackageNoGenerateStepService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesPackageDataContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.IFsmRouteDataService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseSwsService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
@@ -39,7 +39,11 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
     @Autowired
     private IMesPackageNoGenerateStepService packageNoGenerateStepService;
 
+    @Autowired
+    private IFsmRouteDataService fsmRouteDataService;
+
     @Override
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
     public Object doCustomApiDispatch(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel) {
 
         Map<String, Object> resultMap = new HashMap<>();
@@ -107,10 +111,13 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
         try {
             packageNoGenerateStepService.doForcePrint(reqBean, resultBean, stepResult, packageDataContextList, packageDb);
         } catch (ImppBusiException e) {
-            stepResult.msg(e.getMessage());
+            stepResult.msg(e.getErrorDetail());
         } catch (Exception e) {
-            stepResult.msg(e.getMessage());
+            String error = String.format("生产线[%s]工位[%s]强制打包%s", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), fsmRouteDataService.handleFsmCfgOrDefault(reqBean, MesPcnEnumUtil.FSM_CFG.FSM_EXCEPTION_MSG.getCode()));
+            this.cacheException(reqBean, reqBean.getStepName(), error, e, false);
+            stepResult.msg(error);
         }
+
         if (!StringUtils.isEmpty(stepResult.getMsg())) {
             return packResultMap(reqBean, resultBean, resultMap,
                     String.format("生产线[%s]工位[%s]强制打包失败,%s", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), stepResult.getMsg()));

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java

@@ -39,6 +39,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -474,6 +476,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
         mesProduceSnPrintModel.getPackageList().addAll(packageList);
 
         MesProduceSnPrintModel printModel = null;
+
         try {
             printModel = strategyService.execute(null, mesProduceSnPrintModel, null, stepResult, reqBean, true);
         } catch (ImppBusiException e) {
@@ -485,7 +488,10 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
                 this.sendMessage(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.ERROR.getValue()), webMsg, MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
                 this.cacheException(reqBean, reqBean.getStepName(), webMsg, e, true);
                 foundExThrowNoShowMsg();
-            } else MesPcnException.throwBusiException("%s %s!", webMsg, e.toString());
+            } else {
+                this.cacheException(reqBean, reqBean.getStepName(), webMsg, e, false);
+                MesPcnException.throwBusiException(webMsg);
+            }
         }
 
         if (CollectionUtils.isEmpty(printModel.getPrintContextList())) return;
@@ -503,6 +509,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = {ImppBusiException.class, Exception.class})
     public void doForcePrint(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, List<MesPackageDataContext> packageDataContextList, MesPackage packageDb) {
         savePackageDb(reqBean, packageDb, packageDataContextList.size(), true, false);
         List<MesPackage> packageList = new ArrayList<>();

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/IMesPackageNoGenerateStepService.java

@@ -15,6 +15,6 @@ public interface IMesPackageNoGenerateStepService {
 
     MesPackage getMesPackage(String organizeCode, Long packageId);
 
-    @Transactional(propagation = Propagation.NESTED, rollbackFor = {ImppBusiException.class, Exception.class})
+
     void doForcePrint(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, List<MesPackageDataContext> packageDataContextList, MesPackage packageDb);
 }