41236 非排序加工规则-编辑时未带出字段

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java

@@ -5,15 +5,22 @@ import cn.estsh.i3plus.ext.mes.apiservice.config.HuaWeiCloudObsConfig;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesFile;
 import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace;
 import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysFile;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.fileservice.ImppFileService;
 import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.obs.services.ObsClient;
 import com.obs.services.exception.ObsException;
@@ -60,7 +67,11 @@ public class MesMediaFileCfgController extends BaseMesController<MesMediaFileCfg
 
     @Autowired
     private IMesMediaFileCfgService mediaFileCfgService;
-
+    /**
+     * fastDfs客户端
+     */
+    @Autowired
+    private ImppFileService fileService;
     //默认大小
     private static final long FILE_SIZE = 1024 * 1024;
 
@@ -296,6 +307,37 @@ public class MesMediaFileCfgController extends BaseMesController<MesMediaFileCfg
         }
 
     }
-
+//    @PostMapping(value = "/sys-upload")
+//    @ApiOperation(value = "系统导入")
+//    public ResultBean insertPartFurnace(@RequestParam("file") MultipartFile file, MesMediaFileCfg mesMediaFileCfg) {
+//        try {
+//            if (file.isEmpty()) {
+//                throw ImppExceptionBuilder.newInstance()
+//                        .setSystemID(CommonEnumUtil.SOFT_TYPE.REPORT.getCode())
+//                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                        .setErrorDetail("不允许上传空文件")
+//                        .build();
+//            }
+//            SysFile sysFile = fileService.upload(file, CommonEnumUtil.SOFT_TYPE.MES.getValue());
+////            MesFile mesFile = fileService.uploadMesFile(file, AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
+//
+//            //属性验证
+//            ValidatorBean.beginValid(mesMediaFileCfg)
+//                    .notNull("modelNo", mesMediaFileCfg.getFileType());
+//
+//            MesMediaFileCfg mesMediaFileCfg1 = new MesMediaFileCfg();
+//            mesMediaFileCfg1.setFileName(sysFile.getDfsFileName());
+//            mesMediaFileCfg1.setFileUrl(sysFile.getFilePath());
+//            mesMediaFileCfg1.setFileType(mesMediaFileCfg.getFileType());
+//            mediaFileCfgRepository.save(mesMediaFileCfg1);
+//
+//            return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//        } catch (ImppBusiException imppException) {
+//            LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException);
+//            return ResultBean.fail(imppException);
+//        } catch (Exception e) {
+//            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+//        }
+//    }
 
 }

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

@@ -236,8 +236,15 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             getCustomerPart(item);
         }
         //生成工单号
-        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
-        List<String> orderList = syncFuncService.syncSerialNo(genSerialNoModel, item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
+        List<String> orderList=new ArrayList<>();
+        if(item.getWorkOrderType() != MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){
+            GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_CENTER_ORDER_NO);
+            genSerialNoModel.setPartNo(item.getWorkCenterCode());
+            orderList = syncFuncService.syncSerialNo(genSerialNoModel, item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
+        }else {
+            GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
+            orderList = syncFuncService.syncSerialNo(genSerialNoModel, item.getCreateUser(), item.getOrganizeCode(), 1).getResultList();
+        }
         String orderNo = orderList.get(0);
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(orderNo, "workOrderNo", orderPackBean);

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java

@@ -25,6 +25,8 @@ public class MesCommonConstant {
     public static final String ORDER_NO_BTO_SEQ = "ORDER_NO_BTO_SEQ";
     //排序单号规则
     public static final String MES_WORK_ORDER_NO = "MES_WORK_ORDER_NO";
+    //产线代码独立排序单号规则
+    public static final String MES_WORK_CENTER_ORDER_NO = "MES_WORK_CENTER_ORDER_NO";
     //报工条码规则
     public static final String REPORT_SN = "REPORT_SN";
     //装车单号