From 85b574e3a9366bd3bbdefd4103a0e150bdb844c0 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 19 Jan 2026 14:58:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=91=BD=E4=B8=AD=EF=BC=8C=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CertificateMaintenanceServiceImpl.java | 3 +++ .../service/impl/EquipmentMaintenanceServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java index 4b30b14ec..3b7bae96c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -90,6 +90,9 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl values = idCodeMap.keySet(); + if (null == values || values.size() < 1) { + return R.fail("工号:" + String.join(",", codes) + "不存在。"); + } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PostHandleEntity::getUserId, values) .eq(PostHandleEntity::getStaffType, StaffTypeEnum.FORMAL.getCode().shortValue()) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java index 177350b11..aecae90b4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -89,6 +89,9 @@ public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl values = idCodeMap.keySet(); + if (null == values || values.size() < 1) { + return R.fail("工号:" + String.join(",", codes) + "不存在。"); + } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PostHandleEntity::getUserId, values) .eq(PostHandleEntity::getStaffType, StaffTypeEnum.FORMAL.getCode().shortValue()) From 0157631aafb42c1cf122bcaab529150b96e2b124 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Mon, 19 Jan 2026 15:35:02 +0800 Subject: [PATCH 2/3] =?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 6b799ad7a..1ff4e3108 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 7b6ecc02e..b78acb556 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 000000000..2b128a098 --- /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 000000000..6b1c661b7 --- /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 000000000..c91cf4389 --- /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 000000000..2c6e9d576 --- /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 000000000..6949db7cc --- /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 000000000..85cf7645b --- /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 000000000..d7082de7a --- /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 000000000..55b763f41 --- /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 000000000..1cda4ef69 --- /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 000000000..323a2b526 --- /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 000000000..f90343db7 --- /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 000000000..cfcfcddb9 --- /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 000000000..418941077 --- /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 000000000..42dd68c12 --- /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 000000000..ff1263e1c --- /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 cfd09b4b6..7e6c5f8a1 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 30a924009..000000000 --- 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 0c033150c..1d2c31c47 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 9f01253dd..5448e43f8 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 891c77c03..000000000 --- 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; -} From 19896db778ec03e0584976e8e3fe41bb08cee4b2 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 19 Jan 2026 17:50:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 10 +- .../desk/dashboard/pojo/dto/DsTaskingDTO.java | 5 + .../entity/DsBatchPreservePlanEntity.java | 27 +- .../dashboard/pojo/entity/DsPartEntity.java | 1 - .../pojo/entity/DsTaskingEntity.java | 5 + blade-service/blade-desk/pom.xml | 20 +- .../dashboard/constant/BatchConstant.java | 32 ++ .../DsBatchPreservePlanController.java | 9 +- .../controller/DsSimilarPartsController.java | 3 +- .../controller/DsTaskingController.java | 8 +- .../mapper/BatchPreservePlanMapper.xml | 4 + .../mapper/BatchWorkCenterSetMapper.xml | 1 + .../mapper/DsSimilarPartsMapper.java | 1 + .../dashboard/mapper/DsTaskingMapper.java | 2 +- .../desk/dashboard/mapper/PartMapper.xml | 1 + .../desk/dashboard/mapper/ProModelMapper.xml | 1 + .../dashboard/mapper/SimilarPartsMapper.xml | 5 + .../desk/dashboard/mapper/TaskingMapper.xml | 5 +- .../service/IDsSimilarPartsService.java | 7 + .../impl/DsBatchPreservePlanServiceImpl.java | 28 +- .../service/impl/DsProModelServiceImpl.java | 31 +- .../impl/DsSimilarPartsServiceImpl.java | 13 +- .../service/impl/DsTaskingServiceImpl.java | 17 +- .../BsSafeInspectionPointController.java | 5 +- .../desk/energy/util/Configer.java | 170 ++++----- .../desk/energy/util/ExportUtil.java | 330 +++++++++--------- .../desk/energy/util/JasperReportUtil.java | 230 ++++++------ .../erpdata/ErpDataApplication.java | 4 +- 28 files changed, 559 insertions(+), 416 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 83e6bdc60..2397f8617 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -14,9 +14,9 @@ public interface LauncherConstant { */ // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 -// String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; + String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** * nacos 用户名 @@ -134,6 +134,12 @@ public interface LauncherConstant { */ String APPLICATION_MONITOR_NAME = "blade-monitor"; + + /** + * 生产监控 + */ + String APPLICATION_ERP_DATA_NAME = "blade-erpData"; + /** * seata 服务组格式 * diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java index 10f502f25..cf1592b10 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java @@ -42,4 +42,9 @@ public class DsTaskingDTO extends DsTaskingEntity { @Serial private static final long serialVersionUID = 1L; + /** + * taskId + */ + private String taskId; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java index 81f00c7e5..e3b6dd19c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java @@ -59,6 +59,7 @@ public class DsBatchPreservePlanEntity extends BaseEntity { * 安排日期 */ @Schema(description = "安排日期") + private Date arrangeTime; /** * 维护内容 @@ -104,7 +105,7 @@ public class DsBatchPreservePlanEntity extends BaseEntity { * 规则类型 */ @Schema(description = "规则类型") - private Long ruleType; + private Integer ruleType; /** * 参数1 */ @@ -140,16 +141,16 @@ public class DsBatchPreservePlanEntity extends BaseEntity { private Integer cumulativeTriggerValue; /** - * 当前值（累计） + * 当前值 */ - @Schema(description = "当前值（累计）") + @Schema(description = "当前值") private Integer currentValue; /** * 累计初始值 */ @Schema(description = "累计初始值") - private Integer cumulativeInitialValue; + private String cumulativeInitialValue; /** * 审核意见 @@ -157,4 +158,22 @@ public class DsBatchPreservePlanEntity extends BaseEntity { @Schema(description = "审核意见") private String approvalOpinion; + /** + * 累计类状态 1.进行中 2.已完成 + */ + @Schema(description = "累计类状态") + private Integer accumulatedStatus; + + /** + * 累计类有效期 1.长期 2.一次性 + */ + @Schema(description = "累计类有效期") + private Integer periodOfValidity; + + /** + * 设备（外键） + */ + @Schema(description = "设备（外键）") + private Long device; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java index 342cd3345..f797f7d60 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java @@ -246,7 +246,6 @@ public class DsPartEntity extends BaseEntity { * 零件类型 */ @Schema(description = "零件类型") - private Integer sinTerType; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java index 88571817a..313885b16 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java @@ -172,6 +172,11 @@ public class DsTaskingEntity extends BaseEntity { @Schema(description = "返工单号") private String reworkOrder; + /** + * 接收时间 + */ + @Schema(description = "接收时间") + private Date receptionTime; } diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 6ab9351d1..0f3a8fd70 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -72,21 +72,21 @@ compile - - com.videasoft - vwebfrk-base - 1.4.6-RELEASE - + + + + + org.codehaus.groovy groovy 3.0.9 - - com.videasoft.m3 - barbecue - 0.0.1 - + + + + + com.itextpdf itext7-core diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java index 2d9a9f67e..b1829413a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java @@ -24,6 +24,38 @@ public interface BatchConstant { Integer REGULAR_DEVICE = 4; + /** 槽液累计类规则类型*/ + /** + * 电量差类 + */ + public static final Integer ELECTRICITY_DIFFERENCE = 1; + + /** + * 累计电量类 + */ + public static final Integer CUMULATIVE_ELECTRICITY = 2; + + /** + * 累计生产日期 + */ + public static final Integer CUMULATIVE_PRODUCTION_DAYS = 3; + + /** + * 主盐添加量类 + */ + public static final Integer MAIN_SALT_ADDITION = 4; + + /** + * 累计生产面积 + */ + public static final Integer CUMULATIVE_PRODUCTION_AREA = 5; + + /** + * 累计主盐添加量 + */ + public static final Integer CUMULATIVE_MAIN_SALT_ADDITION = 6; + + /** 槽液检查任务状态*/ /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java index 00124b67f..8b0ab673b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java @@ -177,13 +177,12 @@ public class DsBatchPreservePlanController extends BladeController { @ApiOperationSupport(order = 8) @Operation(summary = "审批", description = "") public R factoryApproval() { - //todo 新增时没有向任务表中增加任务状态 是否更改 - //todo 创建槽液精细化-计划类-任务发起任务定时器运行... + // 创建槽液精细化-计划类-任务发起任务定时器运行... dsBatchPreservePlanService.createPlanClassTask(); - //todo 创建槽液精细化-定期类-任务发起任务定时器运行 - //todo 存在问题 查询3和4 没有时间限制 每天查询 每天新增 + // 查询3和4 没有时间限制 每天查询 每天新增 + //创建槽液精细化-定期类-任务发起任务定时器运行... dsBatchPreservePlanService.createPeriodicalClassTask(); - //todo 创建槽液精细化-累计类-任务发起任务定时器运行 + // 创建槽液精细化-累计类-任务发起任务定时器运行... dsBatchPreservePlanService.createAccumulateClassTask(); return R.status(true); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java index c27bd77fe..404c0ce25 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java @@ -116,7 +116,8 @@ public class DsSimilarPartsController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入dsSimilarParts") public R save(@Valid @RequestBody DsSimilarPartsEntity dsSimilarParts) { - return R.status(dsSimilarPartsService.save(dsSimilarParts)); + + return R.status(dsSimilarPartsService.saveSimilarParts(dsSimilarParts)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java index 1545210ed..f3d2912f1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java @@ -205,12 +205,12 @@ public class DsTaskingController extends BladeController { /** * 任务接收 */ - @GetMapping("/taskReception") + @PostMapping("/taskReception") @ApiOperationSupport(order = 4) @Operation(summary = "任务接收") - public R taskReception( @RequestParam String taskIds) { - Long Id = Long.valueOf(taskIds); - return R.status(dsTaskingService.taskReception(Id)); + public R taskReception( @RequestBody DsTaskingDTO tasking) { + Long taskId = Long.valueOf(tasking.getTaskId()); + return R.status(dsTaskingService.taskReception(taskId)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml index ad4bf5267..db6e7b1ab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchPreservePlanMapper.xml @@ -30,6 +30,10 @@ + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml index 374fceb30..a5c100da4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BatchWorkCenterSetMapper.xml @@ -26,6 +26,7 @@ and WC_ID = #{dsBatchWorkCenterSet.wcId} + order by update_time desc diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java index db2c6623d..04f84fafb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsSimilarPartsMapper.java @@ -60,4 +60,5 @@ public interface DsSimilarPartsMapper extends BaseMapper { */ List exportDsSimilarParts(@Param("ew") Wrapper queryWrapper); + DsSimilarPartsEntity selectByPartOneAndPartTwo(@Param("dsSimilarParts") DsSimilarPartsEntity dsSimilarParts); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java index 162614ec5..de10b0efb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java @@ -75,7 +75,7 @@ public interface DsTaskingMapper extends BaseMapper { * @param dsTasking * @return */ - List selectDisposeList(IPage page, @Param("dsTasking")DsTaskingVO dsTasking); + List selectDisposeList(IPage page, @Param("dsTasking") DsTaskingVO dsTasking); /** * 根据零件号 版本号 任务状态查询 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml index c2e1bf632..617351378 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml @@ -51,6 +51,7 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml index 682fc6303..2a994adf3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProModelMapper.xml @@ -40,6 +40,7 @@ and name like concat(concat('%', #{dsProModel.name}), '%') + order by update_time desc diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml index eafa12f3c..ea70695cd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml @@ -32,5 +32,10 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml index a27a26cd2..c517893e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml @@ -72,13 +72,16 @@ and PART_CODE = #{dsTasking.partCode} + + and CRAFT_MAN = #{dsTasking.craftMan} + and TASK_STATUS in #{taskStatus} - ORDER BY CREATE_TIME DESC + ORDER BY ASSIGN_TIME DESC