From 0157631aafb42c1cf122bcaab529150b96e2b124 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Mon, 19 Jan 2026 15:35:02 +0800 Subject: [PATCH] =?UTF-8?q?erpdata=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/enums/YieldOrderEnum.java | 2 +- .../desk/order/pojo/vo/YieldOrderVo.java | 14 ++++ .../springblade/erpdata/cache/DictCache.java | 26 ++++++ .../erpdata/constant/DictConstant.java | 22 +++++ .../erpdata/pojo/dto/table/Prtbasdef.java | 10 +++ .../erpdata/pojo/dto/table/Prtmsg.java | 10 +++ .../erpdata/pojo/dto/table/Rrbwoerptomes.java | 10 +++ .../erpdata/pojo/dto/table/Wo.java | 10 +++ .../pojo/dto/view/MesRbPacturnrecord.java | 10 +++ .../pojo/dto/view/MesRbPartoplink.java | 10 +++ .../erpdata/pojo/dto/view/MesRbPk.java | 10 +++ .../erpdata/pojo/dto/view/MesRbPurtoso.java | 10 +++ .../erpdata/pojo/dto/view/MesRbSjso.java | 10 +++ .../pojo/dto/view/MesRbSodelrecwx.java | 10 +++ .../pojo/dto/view/MesRbSodelreczg.java | 10 +++ .../erpdata/pojo/dto/view/MesRbWo.java | 10 +++ .../pojo/dto/view/MesRbWxpromotion.java | 10 +++ blade-service/blade-erpdata/pom.xml | 6 ++ .../erpdata/constant/FormulaConst.java | 13 --- .../erpdata/mapper/ErpDataSearchMapper.java | 4 +- .../erpdata/mapper/ErpDataSearchMapper.xml | 2 +- .../erpdata/pojo/dto/YieldPlanErpDTO.java | 80 ------------------- 22 files changed, 202 insertions(+), 97 deletions(-) create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/cache/DictCache.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/constant/DictConstant.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtbasdef.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtmsg.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Rrbwoerptomes.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Wo.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java create mode 100644 blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java delete mode 100644 blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/constant/FormulaConst.java delete mode 100644 blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/pojo/dto/YieldPlanErpDTO.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java index 6b799ad7..1ff4e310 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java +++ b/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), diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java index 7b6ecc02..b78acb55 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java +++ b/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; } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/cache/DictCache.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/cache/DictCache.java new file mode 100644 index 00000000..2b128a09 --- /dev/null +++ b/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; +// } + +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/constant/DictConstant.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/constant/DictConstant.java new file mode 100644 index 00000000..6b1c661b --- /dev/null +++ b/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"; + +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtbasdef.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtbasdef.java new file mode 100644 index 00000000..c91cf438 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtmsg.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtmsg.java new file mode 100644 index 00000000..2c6e9d57 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Rrbwoerptomes.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Rrbwoerptomes.java new file mode 100644 index 00000000..6949db7c --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Wo.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Wo.java new file mode 100644 index 00000000..85cf7645 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java new file mode 100644 index 00000000..d7082de7 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java new file mode 100644 index 00000000..55b763f4 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java new file mode 100644 index 00000000..1cda4ef6 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java new file mode 100644 index 00000000..323a2b52 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java new file mode 100644 index 00000000..f90343db --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java new file mode 100644 index 00000000..cfcfcddb --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java new file mode 100644 index 00000000..41894107 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java new file mode 100644 index 00000000..42dd68c1 --- /dev/null +++ b/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 { +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java new file mode 100644 index 00000000..ff1263e1 --- /dev/null +++ b/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 { +} diff --git a/blade-service/blade-erpdata/pom.xml b/blade-service/blade-erpdata/pom.xml index cfd09b4b..7e6c5f8a 100644 --- a/blade-service/blade-erpdata/pom.xml +++ b/blade-service/blade-erpdata/pom.xml @@ -36,6 +36,12 @@ 4.6.0.RELEASE compile + + org.springblade + blade-desk-api + 4.6.0.RELEASE + compile + cn.hutool diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/constant/FormulaConst.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/constant/FormulaConst.java deleted file mode 100644 index 30a92400..00000000 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/constant/FormulaConst.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springblade.erpdata.constant; - -public interface FormulaConst { - - /** - * - */ - final Integer TYPE_1 = 1; - /** - * - */ - final Integer TYPE_2 = 2; -} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java index 0c033150..1d2c31c4 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.java +++ b/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 getYieldPlanErpList(); + List getYieldPlanErpList(); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml index 9f01253d..5448e43f 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataSearchMapper.xml @@ -8,7 +8,7 @@ where 1=1 - SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0 diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/pojo/dto/YieldPlanErpDTO.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/pojo/dto/YieldPlanErpDTO.java deleted file mode 100644 index 891c77c0..00000000 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/pojo/dto/YieldPlanErpDTO.java +++ /dev/null @@ -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; -}