zhouz
|
d74f04a80f
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-06-13 15:20:10 +08:00 |
|
|
|
c641eedbf3
|
opt: 提示
|
2025-06-13 10:27:18 +08:00 |
|
zhouz
|
7936ab91d0
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-06-13 10:16:41 +08:00 |
|
zhangzq
|
0530a9fab8
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-06-13 09:58:26 +08:00 |
|
zhangzq
|
9cbeca4e3c
|
fix:管制判断4
|
2025-06-13 09:58:19 +08:00 |
|
|
|
ec3b2d0854
|
opt: 时间动态设置
|
2025-06-13 09:56:52 +08:00 |
|
zhangzq
|
a3d5593443
|
fix:管制判断4
|
2025-06-12 22:53:05 +08:00 |
|
zhouz
|
36495109cf
|
fix:修改所有写死的管制点
|
2025-06-12 20:11:29 +08:00 |
|
zhangzq
|
25f796e201
|
opt:优化二次分配锁力度；优化重复申请时直接反馈陈工
|
2025-06-12 20:02:47 +08:00 |
|
|
|
251723507c
|
opt: 套轴计划查询SQL
|
2025-06-12 15:37:04 +08:00 |
|
zhouz
|
285605b151
|
fix:修改所有写死的管制点
|
2025-06-12 15:04:20 +08:00 |
|
zhouz
|
9853d7129e
|
fix:MES同步BOM信息
|
2025-06-12 14:28:18 +08:00 |
|
zhouz
|
917bf37baa
|
fix:将管制点改为查询点位下拉框
|
2025-06-12 11:19:54 +08:00 |
|
|
|
dbd45a5bf6
|
rev: 去除重量重复设置
|
2025-06-12 11:16:57 +08:00 |
|
|
|
18aa216a9b
|
opt: 套轴完成异常处理
|
2025-06-11 19:22:38 +08:00 |
|
zhouz
|
81bfb2b213
|
fix：空木箱入库新增托盘重量校验；分切计划套轴按照创建时间排序；烘箱冷却页面查询修复
|
2025-06-11 14:00:23 +08:00 |
|
|
|
338257ab9f
|
opt: 套轴异常处理流程
|
2025-06-09 17:18:33 +08:00 |
|
|
|
f413bfeb82
|
fix: 初始化穿拔轴将预分配清除
|
2025-06-09 15:23:21 +08:00 |
|
|
|
62cfd39fbe
|
fix: 使用计划代数而非气胀轴库点位
|
2025-06-09 13:11:36 +08:00 |
|
|
|
a1c4ea6a92
|
opt: 错误看板信息
|
2025-06-06 16:47:26 +08:00 |
|
zhangzq
|
e26e5df2a2
|
opt:送空任务增加空洞校验
|
2025-06-06 15:20:45 +08:00 |
|
zhouz
|
566a1db0f5
|
fix：冷却区查询BUG优化
|
2025-06-06 09:37:10 +08:00 |
|
|
|
2f4bd64a91
|
opt: 套轴多次问题修复SQL-判空、过滤组别
|
2025-06-04 17:13:16 +08:00 |
|
zhangzq
|
83e4d5a778
|
add:增加烘箱冷却区看板
|
2025-06-04 14:36:31 +08:00 |
|
zhouz
|
de6babd4eb
|
fix：提示优化
|
2025-06-04 14:19:57 +08:00 |
|
|
|
e39b5c0e3b
|
opt: 套轴多次问题修复、看板数据优化、送轴问题优化
|
2025-06-04 13:43:40 +08:00 |
|
|
|
f2ae4b8670
|
opt: 重复套轴问题
|
2025-06-03 09:14:51 +08:00 |
|
|
|
a4100a9fb0
|
fix: 不套轴提醒放置看板2
|
2025-05-30 16:08:08 +08:00 |
|
|
|
c70c54794b
|
fix: 不套轴提醒放置看板
|
2025-05-30 16:06:00 +08:00 |
|
zhouz
|
37aa0bc727
|
fix：优化B1分切上料，提醒没有可用的冷却区提示逻辑
|
2025-05-30 15:31:43 +08:00 |
|
|
|
1756706642
|
fix: bug修复
|
2025-05-30 10:37:07 +08:00 |
|
zhouz
|
d0ba3ac408
|
fix：修改
|
2025-05-28 16:11:10 +08:00 |
|
|
|
8fedac67aa
|
feat: 套轴日志看板
|
2025-05-27 20:31:53 +08:00 |
|
zhouz
|
c5a63cd8b6
|
add:新增与MES用于更新分切计划和订单BOM信息的接口
|
2025-05-26 15:07:43 +08:00 |
|
zhangzq
|
5467a7514c
|
add:增加烘箱冷却区看板
|
2025-05-25 21:07:15 +08:00 |
|
zhangzq
|
5eca263ff7
|
init:海亮测试数据库88主85从
|
2025-05-23 10:45:13 +08:00 |
|
zhangzq
|
ad7bfbfc7f
|
init:一期二期代码合并
|
2025-05-22 14:13:19 +08:00 |
|
zhangzq
|
2dfe5f22de
|
Merge remote-tracking branch 'origin/master_merge' into master_1_opt
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
# lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java
# lms/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CellTypeEnum.java
# lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
# lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
# lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
# lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
# lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
# lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
# lms/nladmin-system/src/main/resources/config/application-dev.yml
# lms/nladmin-system/src/main/resources/config/application-prod.yml
# lms/nladmin-ui/src/views/login.vue
# lms/nladmin-ui/src/views/system/user/index.vue
# lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
# lms/nladmin-ui/src/views/wms/sch/task/index.vue
|
2025-05-22 13:44:35 +08:00 |
|
zhangzq
|
51464a41e3
|
fix：取货点未qzz_point
|
2025-05-22 11:28:17 +08:00 |
|
|
|
0b2532edbd
|
add:新增分切暂存维护功能
|
2025-05-21 16:53:57 +08:00 |
|
zhangzq
|
25f61098cf
|
fix：取货点未qzz_point
|
2025-05-21 15:26:52 +08:00 |
|
zhangzq
|
258109e20a
|
fix：取货点未qzz_point
|
2025-05-20 16:50:05 +08:00 |
|
zhangzq
|
df866ae0d1
|
fix:修复虚拟货位生成只到100的问题
|
2025-05-20 16:42:48 +08:00 |
|
zhouz
|
541779da6b
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-05-20 14:41:43 +08:00 |
|
zhouz
|
4da7b42b54
|
fix:包装关系查询页面客户要求幅宽精度修改
|
2025-05-20 14:41:31 +08:00 |
|
|
|
2cf482f5f5
|
fix: 固定sql改为变量传入（暂时不影响）
|
2025-05-16 15:50:32 +08:00 |
|
zhangzq
|
7ef22815e7
|
fix:修复虚拟货位生成只到100的问题
|
2025-05-14 16:34:57 +08:00 |
|
zhouz
|
c93bda46dd
|
fix:入库全部分配新加仓库标识
|
2025-05-14 16:16:03 +08:00 |
|
zhangzq
|
1b6871cb59
|
fix:修复虚拟货位生成只到100的问题
|
2025-05-14 16:11:49 +08:00 |
|
zhangzq
|
4d88480851
|
add:子卷步骤导出
|
2025-05-13 15:20:54 +08:00 |
|
