zhouz
|
9927637543
|
fix:扩容增加校验和日志
|
2025-09-01 16:04:26 +08:00 |
|
zhouz
|
76ddd010b7
|
fix:逻辑校验优化
|
2025-08-26 10:09:35 +08:00 |
|
zhouz
|
7ceae64eef
|
fix:出库校验是否填写物流公司和预估运费
|
2025-08-25 13:48:34 +08:00 |
|
zhouz
|
2e6c0775b1
|
fix:入库扩容问题修改
|
2025-08-25 10:10:14 +08:00 |
|
zhouz
|
ad4ff02d40
|
fix:获取移库单对应的移入货位时，加上并发锁
|
2025-08-19 17:52:36 +08:00 |
|
zhouz
|
8e7eb4fd05
|
fix:更改BOM信息时，变更对应的分切计划
|
2025-08-18 15:58:20 +08:00 |
|
zhouz
|
53717f806d
|
Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523
|
2025-08-15 10:20:39 +08:00 |
|
zhouz
|
7e5f6e140a
|
合并master1到0523
|
2025-08-15 10:20:10 +08:00 |
|
zhangzq
|
c45205aff4
|
fix:巷道移库判断逻辑优化
|
2025-07-27 23:05:57 +08:00 |
|
zhouz
|
aed0bdc2d7
|
fix:包装关系修改不变更状态
|
2025-07-24 13:39:34 +08:00 |
|
zhouz
|
c7492a6cd7
|
fix:异常入库
|
2025-07-21 08:52:14 +08:00 |
|
yangyufu
|
e849b87eb2
|
删除多余连接查询
|
2025-07-10 15:04:40 +08:00 |
|
yangyufu
|
b3833d52ce
|
fix(wms): 修复出库查询中箱子材质信息问题
- 在子查询中添加 box_type 字段
- 新增与 md_me_materialbase 表的左连接，获取材质名称
- 移除 bst_ivt_boxinfo 表的左连接，不再使用箱型信息
|
2025-07-10 15:04:31 +08:00 |
|
yangyufu
|
13ea603036
|
perf(query): 优化出库查询 SQL 语句
- 修改内联查询为左查询，确保出库记录不会丢失
|
2025-07-10 15:04:26 +08:00 |
|
yangyufu
|
d36b4811d9
|
feat(wms): 退货出库查询页面添加日期范围选择功能- 引入 DateRangePicker组件用于选择日期范围
- 添加 udOperation 组件以支持更新和删除操作
|
2025-07-10 15:04:23 +08:00 |
|
yangyufu
|
d43f56f741
|
feat(wms): 出库查询列表添加木箱编码和木箱描述字段
- 在出库查询列表中新增木箱编码和木箱描述两个字段
|
2025-07-10 15:04:15 +08:00 |
|
zhouz
|
1b49ffcb2e
|
feat(wms): 出库查询新增木箱编码和木箱描述字段
- 在出库查询界面添加木箱编码和木箱描述两个新字段
- 更新后端服务和数据库查询以支持新增字段
|
2025-07-10 15:04:06 +08:00 |
|
zhouz
|
be2459d5b5
|
fix:出库任务被占用，提示优化
|
2025-07-10 15:03:54 +08:00 |
|
zhouz
|
dbbc2a2987
|
fix:出库双通排序更改，扩容IP修改
|
2025-07-01 20:21:59 +08:00 |
|
zhouz
|
c795358f06
|
Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523
|
2025-06-30 22:09:59 +08:00 |
|
zhouz
|
f5a5c4b390
|
fix:分切计划推送优化、出库左出右出排序更改
|
2025-06-30 22:09:46 +08:00 |
|
zhangzq
|
2ff9549ce5
|
add:增加单据锁及一件设置并发锁
|
2025-06-30 21:53:56 +08:00 |
|
zhangzq
|
67d5dca6fd
|
opt:newcode,redisson锁报错
|
2025-06-30 12:07:20 +08:00 |
|
zhangzq
|
db61709c4f
|
opt:druid版本
|
2025-06-30 12:01:26 +08:00 |
|
zhangzq
|
d4a77d71f6
|
fix:修改配置文件jdbc驱动
|
2025-06-30 10:44:05 +08:00 |
|
zhangzq
|
0af5ee4292
|
fix:newcode端口
|
2025-06-30 10:33:04 +08:00 |
|
zhangzq
|
f78b2a76df
|
fix:下发调度问题
|
2025-06-30 10:25:51 +08:00 |
|
zhangzq
|
c1cda9da0e
|
fix:下发调度问题
|
2025-06-30 10:20:56 +08:00 |
|
zhangzq
|
79615d3430
|
Merge remote-tracking branch 'origin/master_1' into master_merge_0523
|
2025-06-30 09:16:08 +08:00 |
|
zhouz
|
62521d3263
|
fix:提示、注释优化
|
2025-06-27 15:01:14 +08:00 |
|
|
|
66e7b1a2c8
|
rev：二期出库测试修改
|
2025-06-25 18:05:22 +08:00 |
|
zhangzq
|
668c9e1200
|
fix:修改dev配置文件数据库驱动
|
2025-06-25 17:44:57 +08:00 |
|
zhouz
|
2a4742421a
|
fix:分切计划改为按照母卷按照数组下发
|
2025-06-24 10:37:46 +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 |
|
