生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java

@@ -1,6 +1,3 @@
-/**
- * Author: Tom Shuo
- */
 package org.springblade.desk.basic.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -28,24 +25,6 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class BasicClazz extends BaseEntity {
 
-    /**
-     * 物料标记
-     */
-    public static Short TYPE_FLAG = 1;
-    /**
-     * 出库原因
-     */
-    public static Short TYPE_OUT_STORE = 2;
-    /**
-     * 退库原因
-     */
-    public static Short TYPE_TK_STORE = 3;
-
-    /**
-     * 简单原因
-     */
-    public static Short TYPE_POOR_REASON = 4;
-
     /**
      * 镀种分类
      */
@@ -56,70 +35,6 @@ public class BasicClazz extends BaseEntity {
      */
     public static Short TYPE_SUSPENSION_NO = 6;
 
-    /**
-     * 外协匹配规则
-     */
-    public static Short TYPE_RULE = 7;
-
-    /**
-     * 排除部门
-     */
-    public static Short TYPE_EXCLUDE_DIVISION = 8;
-
-    /**
-     * 异常配置
-     */
-    public static Short TYPE_ABNORMAL_CONFIG = 9;
-
-    /**
-     * 成本类型
-     */
-    public static Short TYPE_COST_TYPE = 10;
-
-    /**
-     * 烧结转试验计划
-     */
-    public static Short TYPE_TEST_TYPE = 11;
-
-    /**
-     * 绩效模板
-     */
-    public static Short TYPE_JXMB = 12;
-
-    /**
-     * 重点工作类型
-     */
-    public static Short TYPE_ZDGZLX = 13;
-
-    /**
-     * 绩效模板
-     */
-    public static Short TYPE_NOTICE = 14;
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编码
-     */
-    public static final String COL_CODE = "CODE";
-    /**
-     * 名称
-     */
-    public static final String COL_NAME = "NAME";
-    /**
-     * 业务类别
-     */
-    public static final String COL_BIZ_TYPE = "BIZ_TYPE";
-    /**
-     * 备注
-     */
-    public static final String COL_MEMO = "MEMO";
-    /**
-     * 排序
-     */
-    public static final String COL_SORT = "SORT";
-
     /**
      * 编码
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java

@@ -181,7 +181,7 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
                 prefix = "RB";
             }
             User user = UserCache.getUser(AuthUtil.getUserId());
-            String codePattern = prefix + now + user != null ? user.getCode() : "";
+            String codePattern = prefix + now + (user != null ? user.getCode() : "");
 
             hr.setHrCode(this.nextCode(codePattern));
             hr.setWoCode(woCode);