zhouz
|
4fbe1c38c1
|
merge:代码合并
|
2025-11-27 17:57:49 +08:00 |
|
zhangzq
|
51f816de93
|
opt:删除主从配置：WO,WQLCore,WQLObject,DataBaceConfig,ResultBean数据源及数据分装
|
2025-06-23 10:03:49 +08:00 |
|
zhangzq
|
5e7914c19f
|
opt:优化一件设置
|
2025-06-22 13:47:32 +08:00 |
|
zhangzq
|
8b05812975
|
Merge remote-tracking branch 'origin/master_1' into master_merge_0523
|
2025-06-22 12:49:33 +08:00 |
|
zhangzq
|
b0c61ff1ab
|
opt:优化一件设置
|
2025-06-22 12:49:14 +08:00 |
|
zhouz
|
9853d7129e
|
fix:MES同步BOM信息
|
2025-06-12 14:28:18 +08:00 |
|
zhouz
|
c5a63cd8b6
|
add:新增与MES用于更新分切计划和订单BOM信息的接口
|
2025-05-26 15:07:43 +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 |
|
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 |
|
|
|
40addef8a1
|
rev：1、盘点单不能查询管控库存2、报表幅宽小数点保留1位数
|
2025-05-12 16:19:16 +08:00 |
|
|
|
e4ecd9dd34
|
rev：1、盘点单不能查询管控库存2、报表幅宽小数点保留1位数
|
2025-05-12 16:15:05 +08:00 |
|
|
|
1fc76a5042
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-05-10 14:39:44 +08:00 |
|
zhangzq
|
8a1609ae08
|
add:dto
|
2025-05-10 14:38:50 +08:00 |
|
|
|
be9f8e6f8b
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-05-10 14:29:22 +08:00 |
|
|
|
52ae7d9b54
|
fix: 去除测试参数
|
2025-05-10 14:22:55 +08:00 |
|
zhangzq
|
4f2427e086
|
opt:优化拔轴逻辑优先暂存架排序；add:增加称重异常飞书提醒
|
2025-05-10 11:13:34 +08:00 |
|
|
|
94e0250dc6
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-05-10 11:02:09 +08:00 |
|
|
|
b1a5ca5ab1
|
fix: 套轴修改虚拟（实际）相互切换
|
2025-05-10 09:59:15 +08:00 |
|
|
|
3d30c0cd4b
|
add:新增空轴退回事务注解
|
2025-05-08 15:45:55 +08:00 |
|
|
|
61c3972edb
|
opt: 套轴优先托盘上的管芯
|
2025-05-08 15:21:27 +08:00 |
|
zhangzq
|
3eeb8a09bb
|
opt:优化送空载具任务
|
2025-05-06 19:01:41 +08:00 |
|
|
|
ac957794a6
|
fix: 防止横移多次请求
|
2025-05-06 17:17:04 +08:00 |
|
zhangzq
|
bc30038ee2
|
opt:删除空载具任务判断
|
2025-05-06 16:40:03 +08:00 |
|
|
|
b3ccdb44f4
|
fix: 套轴数据赋存位置变化2
|
2025-05-06 12:36:30 +08:00 |
|
|
|
ba7e6c2675
|
fix: 套轴数据赋存位置变化
|
2025-05-06 12:35:27 +08:00 |
|
zhangzq
|
00cc67483e
|
add:增加二楼分切任务数据导出功能
|
2025-05-05 13:16:16 +08:00 |
|
|
|
709595b91b
|
rev:优化空轴退回功能
|
2025-05-04 19:20:28 +08:00 |
|
|
|
29d68a5174
|
fix: 分切缓存位没有计划就直接禁用
|
2025-05-04 15:52:30 +08:00 |
|
|
|
64693677e4
|
fix: 没有管芯的97，98信号问题
|
2025-05-04 14:58:04 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
8cad98fc28
|
opt:备货区数据校验
|
2025-05-04 11:20:19 +08:00 |
|
zhangzq
|
1eccd3aa7b
|
fix:补空任务增加点位任务校验
|
2025-05-03 19:09:54 +08:00 |
|
|
|
e6331956be
|
fix: 拔轴机有轴也不一定能用，判断是否存在搬走的任务
|
2025-05-03 14:56:22 +08:00 |
|
|
|
3b8067e633
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-05-03 10:32:37 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
3f00df76cf
|
opt:提交修改bom木箱类型功能
|
2025-05-02 17:25:46 +08:00 |
|
zhangzq
|
089193516a
|
fix:木箱出库时移库方法增加同巷道校验；opt：子卷下先空洞问题
|
2025-05-02 16:13:04 +08:00 |
|
|
|
80d078e011
|
fix: 套轴完毕暂存创建任务时过滤任务
|
2025-05-02 14:26:01 +08:00 |
|
zhangzq
|
a2d10682ef
|
opt:关闭日志打印
|
2025-05-02 12:19:08 +08:00 |
|
zhangzq
|
da57d8c355
|
fix:货位分配高度丢失；opt:一楼分配逻辑优化
|
2025-05-02 12:13:01 +08:00 |
|
