erpdata模块数据初始化

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java

@@ -73,7 +73,7 @@ public enum YieldOrderEnum {
 	PRIORITY_APS_NORMAL("5级-正常", 15005),
 
 	/**
-	 * 生产订单 校验结果，0：未验证，1：数据缺失，2：工艺缺失，3：资源缺失，4：交期冲突, 5:验证完成
+	 * 生产订单 校验结果，16001：未验证，16002：数据缺失，16003：工艺缺失，16004：资源缺失，16005：交期冲突, 16006:验证完成
 	 */
 	VALIDATION_NO("未验证", 16001),
 	VALIDATION_RESULT_LESS_DATA("数据缺失", 16002),

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java

@@ -27,4 +27,18 @@ public class YieldOrderVo extends YieldOrder {
 	 * 状态名称
 	 */
 	String statusName;
+
+	/**
+	 * 排产优先级名称
+	 */
+	String priorityApsName;
+	/**
+	 * ERP优先级名称
+	 */
+	String priorityErpName;
+
+	/**
+	 * 订单类型名称
+	 */
+	String yieldTypeName;
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/cache/DictCache.java

@@ -0,0 +1,26 @@
+package org.springblade.erpdata.cache;
+
+/**
+ * 字典缓存工具类
+ *
+ * @author Chill
+ */
+public class DictCache {
+
+	private static final String DICT_ID = "dict:id:";
+	private static final String DICT_KEY = "dict:key:";
+	private static final String DICT_VALUE = "dict:value:";
+	private static final String DICT_LIST = "dict:list:";
+
+	private static final Boolean TENANT_MODE = Boolean.FALSE;
+
+//	private static IDictClient dictClient;
+//
+//	private static IDictClient getDictClient() {
+//		if (dictClient == null) {
+//			dictClient = SpringUtil.getBean(IDictClient.class);
+//		}
+//		return dictClient;
+//	}
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/constant/DictConstant.java

@@ -0,0 +1,22 @@
+package org.springblade.erpdata.constant;
+
+/**
+ * 字典常量.
+ *
+ * @author zhuangqian
+ */
+public interface DictConstant {
+
+	String SEX_CODE = "sex";
+
+	String NOTICE_CODE = "notice";
+
+	String MENU_CATEGORY_CODE = "menu_category";
+
+	String BUTTON_FUNC_CODE = "button_func";
+
+	String YES_NO_CODE = "yes_no";
+
+	String FLOW_CATEGORY_CODE = "flow_category";
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtbasdef.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.table;
+
+/**
+ * 对应ERP中表 t_prtbasdef
+ *
+ * @author lqk
+ * @date 2026-01-16 17:32
+ */
+public class Prtbasdef {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtmsg.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.table;
+
+/**
+ * 对应ERP中表 t_prtmsg
+ *
+ * @author lqk
+ * @date 2026-01-16 17:32
+ */
+public class Prtmsg {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Rrbwoerptomes.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.table;
+
+/**
+ * 对应ERP中表 t_rbwoerptomes
+ *
+ * @author lqk
+ * @date 2026-01-16 17:32
+ */
+public class Rrbwoerptomes {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Wo.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.table;
+
+/**
+ * 对应ERP中表 t_wo
+ *
+ * @author lqk
+ * @date 2026-01-16 17:32
+ */
+public class Wo {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_pacturnrecord
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbPacturnrecord {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_partoplink
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbPartoplink {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_pk
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbPk {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_purtoso
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbPurtoso {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_sjso
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbSjso {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_sodelrecwx
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbSodelrecwx {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_sodelreczg
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbSodelreczg {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_wo
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbWo {
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java

@@ -0,0 +1,10 @@
+package org.springblade.erpdata.pojo.dto.view;
+
+/**
+ * 对应ERP中视图 v_mes_rb_wxpromotion
+ *
+ * @author lqk
+ * @date 2026-01-16 17:34
+ */
+public class MesRbWxpromotion {
+}

blade-service/blade-erpdata/pom.xml

@@ -36,6 +36,12 @@
             <version>4.6.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-desk-api</artifactId>
+            <version>4.6.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- 添加Hutool依赖-->
         <dependency>
             <groupId>cn.hutool</groupId>

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/constant/FormulaConst.java

@@ -1,13 +0,0 @@
-package org.springblade.erpdata.constant;
-
-public interface FormulaConst {
-
-    /**
-     *
-     */
-    final Integer TYPE_1 = 1;
-    /**
-     *
-     */
-    final Integer TYPE_2 = 2;
-}

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java

@@ -3,7 +3,7 @@ package org.springblade.erpdata.mapper;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.erpdata.pojo.dto.AllocationDTO;
-import org.springblade.erpdata.pojo.dto.YieldPlanErpDTO;
+import org.springblade.erpdata.pojo.dto.view.MesRbWo;
 
 import java.util.List;
 
@@ -26,5 +26,5 @@ public interface ErpDataSearchMapper extends Mapper {
 	 *
 	 * @return
 	 */
-	List<YieldPlanErpDTO> getYieldPlanErpList();
+	List<MesRbWo> getYieldPlanErpList();
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml

@@ -8,7 +8,7 @@
         where 1=1
     </select>
 
-    <select id = "getYieldPlanErpList" resultType = "org.springblade.erpdata.pojo.dto.YieldPlanErpDTO">
+    <select id = "getYieldPlanErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbWo">
         SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0
     </select>
 

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/pojo/dto/YieldPlanErpDTO.java

@@ -1,80 +0,0 @@
-package org.springblade.erpdata.pojo.dto;
-
-import java.util.Date;
-
-/**
- * 生产计划同步DTO
- *
- * @author lqk
- * @date 2025-11-29 14:02
- */
-public class YieldPlanErpDTO {
-	/**
-	 * 通用计数变量
-	 */
-	private Integer rownum;
-	/**
-	 * 工单编号
-	 */
-	private String wono;
-	/**
-	 * 零件编码
-	 */
-	private String prtno;
-	/**
-	 * 零件批次号
-	 */
-	private String prtlotno;
-	/**
-	 * 计划部门
-	 */
-	private String plndept;
-	/**
-	 * 工单数量
-	 */
-	private Integer woporqty;
-	/**
-	 * 需求日期
-	 */
-	private Date woreqdat;
-	/**
-	 * 计划员
-	 */
-	private String plannerdesc;
-	/**
-	 * 工单日期
-	 */
-	private Date wopordat;
-	/**
-	 * 备注
-	 */
-	private String remark;
-	/**
-	 * 工单总数量
-	 */
-	private Integer wototqty;
-	/**
-	 * 主制部门
-	 */
-	private String prtmdept;
-	/**
-	 * 工艺路线编码
-	 */
-	private String processline;
-	/**
-	 * 保管员描述
-	 */
-	private String warctlrdesc;
-	/**
-	 * 镀种
-	 */
-	private String kdofplat;
-	/**
-	 * 工艺路线描述
-	 */
-	private String processlinedesc;
-	/**
-	 * 生产线
-	 */
-	private String prodline;
-}