root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,663 Commits 10 Branches 0 Tags
0ff15043b928c41f39dc73f8dd2fb7e11e4c859b
Commit Graph

247 Commits

Author SHA1 Message Date
zhouz
0ff15043b9 fix：合并代码后部分SQL不兼容shardingsphereSQL 2026-02-04 09:55:30 +08:00
zhouz
30130025b0 fix：新增装箱桁架 2026-01-12 19:26:40 +08:00
zhouz
4b00c46269 fix:重复冲销问题修复 2025-10-22 16:10:54 +08:00
zhouz
407e196778 fix:报废出库审核对没有库存的卷跳过处理 2025-10-17 15:25:36 +08:00
zhouz
e3b3c6f32f fix:分配页面修改 2025-09-25 12:10:31 +08:00
zhouz
7e5f6e140a 合并master1到0523 2025-08-15 10:20:10 +08:00
zhouz
aed0bdc2d7 fix:包装关系修改不变更状态 2025-07-24 13:39:34 +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
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
zhouz
c93bda46dd fix:入库全部分配新加仓库标识 2025-05-14 16:16:03 +08:00
liuxy
05f98e2d2a rev:1.推送区域库存不查询管控的库存2.成品库存增加是否管控查询条件3.出库单新增不允许新增管控出库类型的出库单 2025-04-15 16:19:53 +08:00
liuxy
f5285e2148 rev:1.推送区域库存不查询管控的库存2.成品库存增加是否管控查询条件3.出库单新增不允许新增管控出库类型的出库单 2025-04-15 15:49:55 +08:00
liuxy
28afaef7ea add：1.库存管控2.管控查询3.相关逻辑处理 2025-04-11 09:10:38 +08:00
DESKTOP-5DIJMF9\admin
e54878bbe8 opt:优化前端查询 2025-02-26 13:05:33 +08:00
DESKTOP-5DIJMF9\admin
40c2cf86b5 opt:优化出入库回传查询 2025-02-25 16:41:12 +08:00
DESKTOP-5DIJMF9\admin
1e086f7f55 opt:优化 2025-02-24 09:12:21 +08:00
DESKTOP-5DIJMF9\admin
f16938c78a opt:出库冲销去掉前端排序 2025-02-23 14:42:20 +08:00
liuxy
244b3ee4c4 rev：改切计划管理。移库管理，成品报废审核管理新增时间查询 2025-02-22 17:00:10 +08:00
liuxy
da49a09509 rev：改切计划管理。移库管理，成品报废审核管理新增时间查询 2025-02-22 16:57:58 +08:00
DESKTOP-5DIJMF9\admin
af6a11289e opt:优化出入库回传 功能查询效率 2025-02-07 16:49:46 +08:00
DESKTOP-5DIJMF9\admin
947bea0cc1 opt:优化出入库回传 功能查询效率 2025-02-07 16:08:22 +08:00
liuxy
1e26b90b6e rev：1.入库管理新增导出功能2.二期出库堆叠增加接口acs申请强制离开 2024-09-27 10:55:13 +08:00
liuxy
589971386b rev：成品报废审核界面新增导出功能 2024-08-28 15:06:26 +08:00
liuxy
1864e2cf4f rev：二期优化：1.成品入库相同巷道找相同销售订单、物料的仓位2.RGV出库任务任务限制二次分配。一期修改：改切管理批次号查询问题 2024-08-19 11:22:47 +08:00
zhouz
cab08052ec 代码合并 2024-06-27 15:23:15 +08:00
liuxy
1c440c1085 rev：按钮显示 2024-06-18 16:51:54 +08:00
liuxy
170170d608 fix：出库分配页面打不开bug修改 2024-06-18 08:54:08 +08:00
zhouz
b4e5ce473d Merge branch 'refs/heads/b_lms' into master_merge 2024-06-14 19:50:38 +08:00
liuxy
d5ea6fad1d Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-06-14 14:13:58 +08:00
liuxy
f4c93965b9 rev：出库任务拆分 2024-06-14 14:13:50 +08:00
龚宝雄
7742b23a55 Merge pull request 'b_lms' (#2) from b_lms into master_merge 
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/2
 2024-06-12 18:57:32 +08:00
gongbaoxiong
5ed5153bb4 opt:优化现场联调产生的一些问题 2024-06-12 18:49:27 +08:00
zhangzq
c33ffe440b Merge branch 'master' into b_lms2 2024-06-07 16:21:32 +08:00
zhouz
ce3324a8af fix;表处代码修改 2024-06-04 10:37:35 +08:00
liuxy
ac608ed2ca rev：出库口自动分配 2024-05-31 09:00:14 +08:00
liuxy
6a4dfd1f22 add：分拣出库 2024-05-22 17:16:05 +08:00
zhouz
6746f0a088 fix:入库修改 2024-05-17 17:02:43 +08:00
liuxy
b6736b9a9d add：拣选出库开发 2024-04-30 10:57:40 +08:00
ZHOUZ\Noble'lift
faf907c38c rev:设置站点增加手动事务 2024-04-12 15:39:47 +08:00
liuxy
5976022aaa rev：1.报废出库回传修改2.出库页面导入excel 2024-04-11 14:53:47 +08:00
liuxy
0f65ab671e rev：是否发超期 文字更改 2024-04-01 17:14:10 +08:00
liuxy
4fb3a59f39 rev：1.出库页面发货信息保存回传sap优化2.出库页面是否超期发货字段优化 2024-03-25 13:53:03 +08:00
ZHOUZ\Noble'lift
7d5a0d61dc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-22 09:38:59 +08:00
ZHOUZ\Noble'lift
baf3ceb384 rev:改切计划新增木箱字段 2024-03-22 09:38:51 +08:00
liuxy
b548ca5205 rev：出库页面优化 2024-03-21 10:33:09 +08:00
liuxy
2f4e488f2c rev：出库分配页面 优化 2024-03-20 09:04:49 +08:00
liuxy
9f5eb3914f Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-19 14:30:09 +08:00
liuxy
565878bde3 rev：1.发货出库不能强控优化2.出库实际重量显示真是发货重量3.B开头子卷保质期为180天优化4.发货信息回传sap优化5.库存报表字段优化6.一键新增仓位优化 2024-03-19 14:29:56 +08:00
ZHOUZ\Noble'lift
080fd348e3 rev:页面优化 2024-03-19 14:20:41 +08:00