root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,398 Commits 9 Branches 0 Tags
66e7b1a2c8e45c233f05bfb12e499c09f42da536
Commit Graph

603 Commits

Author SHA1 Message Date
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
zhouz
4da7b42b54 fix:包装关系查询页面客户要求幅宽精度修改 2025-05-20 14:41:31 +08:00
zhouz
c93bda46dd fix:入库全部分配新加仓库标识 2025-05-14 16:16:03 +08:00
liuxy
40addef8a1 rev：1、盘点单不能查询管控库存2、报表幅宽小数点保留1位数 2025-05-12 16:19:16 +08:00
liuxy
e4ecd9dd34 rev：1、盘点单不能查询管控库存2、报表幅宽小数点保留1位数 2025-05-12 16:15:05 +08:00
zhangzq
00cc67483e add:增加二楼分切任务数据导出功能 2025-05-05 13:16:16 +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
zhangzq
3b60fb6f3a fix:出库下发相同任务号问题 2025-04-25 16:45:34 +08:00
zhangzq
3dc4422ebb opt:任务页面默认查询时间改为后2天 2025-04-25 14:42:50 +08:00
zhangzq
3a98deb92a add:增加木箱回库，装箱区至管制功能； 
opt:木箱移库优先级设置及下发延迟；
add:增加页面调用MES接口功能
 2025-04-22 17:26:35 +08:00
DESKTOP-5DIJMF9\admin
97522dbef6 opt:优化登录页面 2025-04-21 10:56:48 +08:00
zhangzq
aae615a68b add:子卷包装页面增加调用MES接口 2025-04-19 20:21:38 +08:00
zhangzq
19bade4b5f add:子卷步序 2025-04-18 09:49:09 +08:00
liyongde
8b5bfab361 Merge remote-tracking branch 'origin/master_1' into master_1 2025-04-17 12:12:48 +08:00
liuxy
d27446b48f rev：1.新增管控单据备注不能为空2.库存导出新增是否管控字段 2025-04-17 09:17:33 +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
DESKTOP-5DIJMF9\admin
010e26adf6 opt:优化 2025-04-15 13:26:51 +08:00
liyongde
83bcb92bc9 Merge remote-tracking branch 'origin/master_1' into master_1 2025-04-15 12:16:57 +08:00
liuxy
28afaef7ea add：1.库存管控2.管控查询3.相关逻辑处理 2025-04-11 09:10:38 +08:00
liyongde
bbabedb55b Merge remote-tracking branch 'origin/master_1' into master_1 2025-04-10 19:49:48 +08:00
zhangzq
99ed91b01c Merge remote-tracking branch 'origin/master_merge' into master_merge 2025-04-10 19:44:59 +08:00
DESKTOP-5DIJMF9\admin
fb32cfcff1 opt:维护木箱类型和干燥剂数量 2025-04-10 18:38:56 +08:00
DESKTOP-5DIJMF9\admin
74a04a45bc opt:新增木箱类型和干燥剂数量维护 2025-04-10 18:32:51 +08:00
zhangzq
a969d2f707 add:待检区点位大屏 2025-04-10 15:30:18 +08:00
DESKTOP-5DIJMF9\admin
bdbe383851 opt:优化前端客户要求幅宽小数位 2025-04-10 12:56:55 +08:00
zhangzq
3fe7c822b4 Merge remote-tracking branch 'origin/master_1' into one_rebuild_dev 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
 2025-04-01 14:14:41 +08:00
liyongde
867e99bd23 fix: 调试中出现的问题2 2025-03-29 14:37:02 +08:00
DESKTOP-5DIJMF9\admin
8cf38b5193 add:备货管理 2025-03-23 18:14:11 +08:00
DESKTOP-5DIJMF9\admin
72149382ee add:增加备货管理托盘库存查看功能 2025-03-23 18:13:36 +08:00
liyongde
459bd30d25 fix: 套轴时间排序、AGV换托盘 
opt: 下卷校验上下轴
fix: 下卷任务校验
feat: 管芯托盘界面查看
 2025-03-20 13:53:55 +08:00
liuxy
e9c7dce95a rev：前端字段显示 2025-03-14 10:12:13 +08:00
liuxy
65ce55dc67 rev：前端字段显示问题 2025-03-14 10:10:52 +08:00
zhangzq
d880051422 add:增加打包间子卷信息展示 2025-03-08 13:50:32 +08:00
zhangzq
3f9e85eb42 fix:点位查询异常 2025-03-04 19:49:49 +08:00
zhangzq
9b8e1df93e opt:优化日志查询 2025-03-04 14:58:28 +08:00
zhangzq
4357e8eff6 opt:优化日志查询 2025-03-03 21:26:24 +08:00
DESKTOP-5DIJMF9\admin
015b86db23 opt：任务查询优化 2025-02-28 11:28:57 +08:00
DESKTOP-5DIJMF9\admin
0d1852f1af opt：优化 2025-02-28 11:28:25 +08:00
DESKTOP-5DIJMF9\admin
60d26adbc6 opt:提交验箱接口代码，所有回传mes接口增加请求超时时间120s,提交用户页面 部门和角色未回显，提交任务查询优化 2025-02-28 10:21:01 +08:00
DESKTOP-5DIJMF9\admin
0796ca073d opt:提交用户页面 部门和角色未回显，提交任务查询优化 2025-02-27 19:40:52 +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
liyongde
a7d2c0288f rev: 二期内包间改造 2025-02-24 17:11:22 +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
zhangzq
9c834496d9 fix:用户界面selecttable 2025-02-23 14:35:04 +08:00
DESKTOP-5DIJMF9\admin
34426ad5c2 opt:优化时间查询 2025-02-22 17:51:26 +08:00