zhouz
|
422b234821
|
merge:合并一期代码到当前分支
|
2025-11-27 16:10:34 +08:00 |
|
zhouz
|
8813eed262
|
merge:合并二期代码到当前分支
|
2025-11-27 15:25:44 +08:00 |
|
zhouz
|
0f256d3cbe
|
fix:新增定时器
|
2025-11-03 10:57:06 +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 |
|
zhouz
|
40cca955bb
|
fix:同类木箱兼容问题
|
2025-07-14 10:40:12 +08:00 |
|
|
|
85115041c8
|
opt: 加急工单
|
2025-06-24 11:23:16 +08:00 |
|
zhouz
|
da54fc67ab
|
fix:套轴逻辑SQL优化
|
2025-06-17 18:27:51 +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 |
|
zhouz
|
4da7b42b54
|
fix:包装关系查询页面客户要求幅宽精度修改
|
2025-05-20 14:41:31 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
3f00df76cf
|
opt:提交修改bom木箱类型功能
|
2025-05-02 17:25:46 +08:00 |
|
zhangzq
|
3a98deb92a
|
add:增加木箱回库，装箱区至管制功能；
opt:木箱移库优先级设置及下发延迟；
add:增加页面调用MES接口功能
|
2025-04-22 17:26:35 +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 |
|
zhangzq
|
99ed91b01c
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2025-04-10 19:44:59 +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 |
|
|
|
867e99bd23
|
fix: 调试中出现的问题2
|
2025-03-29 14:37:02 +08:00 |
|
zhangzq
|
d880051422
|
add:增加打包间子卷信息展示
|
2025-03-08 13:50:32 +08:00 |
|
|
|
a7d2c0288f
|
rev: 二期内包间改造
|
2025-02-24 17:11:22 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
13db4aad79
|
opt:优化成品库存查询导出
|
2025-02-20 15:01:30 +08:00 |
|
DESKTOP-5DIJMF9\admin
|
c32e12a4c4
|
opt:优化包装关系查询和导出
|
2025-02-20 14:58:47 +08:00 |
|
|
|
ce84f2ce50
|
add:增加一楼内包间点位移库相关逻辑。
|
2024-12-27 16:14:11 +08:00 |
|
|
|
4256e07e41
|
fix: B2生箔下料
|
2024-12-26 14:54:51 +08:00 |
|
|
|
eade24f4a1
|
rev：一期优化：1.虚拟区也加重量卡控：只要有重量的就卡控并且发送飞书2.库存报表中子卷状态筛选查询数据异常问题；二期优化：1.手持入库的时候，如果是第一次入库则需要【生产入库】
|
2024-08-26 17:29:57 +08:00 |
|
|
|
41d8512ec5
|
fix: PC维护重量
|
2024-08-16 17:42:50 +08:00 |
|
|
|
2b816302ba
|
fix: 纸管重量显示错误
|
2024-08-14 09:39:56 +08:00 |
|
|
|
526ca7aa40
|
add:增加手持子卷装箱功能
|
2024-08-02 11:01:51 +08:00 |
|
|
|
eaa3945e14
|
opt:增加子卷重量校验
|
2024-08-01 14:26:30 +08:00 |
|
|
|
076ef25531
|
fix:修复查询订单号异常
|
2024-07-31 16:11:58 +08:00 |
|
|
|
2cc00c2c06
|
opt:
1.子卷装箱增加子卷质检生成包装关系，去除临时包装关系；
2.修改最后一个子卷判断方式；
3.恢复装箱毛重推送，优化装箱页面；
|
2024-07-31 13:53:18 +08:00 |
|
|
|
c100af51e3
|
fix：一期子卷包装页面新增【是否入库】查询条件
|
2024-07-30 17:50:26 +08:00 |
|
|
|
b4f28a15cd
|
fix: 工单显示重量
|
2024-07-23 19:02:20 +08:00 |
|
|
|
d21648c6e9
|
rev：子卷装箱
|
2024-07-20 11:25:26 +08:00 |
|
|
|
dd39ac725a
|
opt:优化装箱区——>待检区送空载具逻辑
|
2024-07-13 23:57:07 +08:00 |
|
|
|
ee2561a19b
|
fix:修改点位库存修改问题
|
2024-07-12 14:18:56 +08:00 |
|
|
|
62774053a3
|
fix:增加桁架任务及二次分配任务完成情况校验
|
2024-07-11 19:26:58 +08:00 |
|
|
|
2d53076a8f
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 08:32:44 +08:00 |
|
|
|
9838e9da98
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 00:39:49 +08:00 |
|
|
|
71f320e158
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 22:44:23 +08:00 |
|
|
|
74decb66f7
|
fix: pc可修改分切计划信息-前端
|
2024-07-02 22:44:13 +08:00 |
|
|
|
c3a8cd70bd
|
add:增加子卷规格校验
|
2024-07-02 17:13:27 +08:00 |
|
|
|
3faf1b65c1
|
add:增加装箱区库存页面
|
2024-07-02 16:30:19 +08:00 |
|
|
|
9ecc870369
|
opt:优化子卷装箱校验逻辑
|
2024-06-30 18:10:59 +08:00 |
|
|
|
217e8d86d2
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
|
2024-06-28 09:19:18 +08:00 |
|
|
|
a9ef3d8f69
|
fix:增加二次分配任务重复校验
|
2024-06-28 01:30:03 +08:00 |
|
|
|
e88415bada
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-27 16:00:57 +08:00 |
|
|
|
a714b8e2d6
|
fix:修复前端子卷号重复校验
|
2024-06-27 15:11:31 +08:00 |
|
