sfms3.0-uniapp

Commit Graph

Select branches

Hide Pull Requests

hella_online_20240803

hella_online_20240816

hella_online_20240819

hella_online_20240821

hella_online_20240823

hella_online_20240828

hella_online_20240829

hella_online_20240904

hella_online_20240906

hella_online_20240911

hella_online_20240913

hella_online_20240919

hella_online_20240924

hella_online_20240927

hella_online_20241011

hella_online_20241017

hella_online_20241024

hella_online_20241030

hella_online_20241107

hella_online_20241114

hella_online_20241121

hella_online_20241128

hella_online_20241205

hella_online_20241212

hella_online_20241219

hella_online_20241226

hella_online_20250109

hella_online_20250123

hella_vue3

intes_online20250115

intex

intex_20241211

intex_online20241111

intex_online20241205

intex_online20241216

intex_online20241228

lijuncheng0816

ljc_0803

master

master_hella

syhx

syhx_app_vue3

wms3.0_pda

#1

5.1版本

88f6dfa367 HL-5366 HL-5481盲盘，pda扫描同一箱码，同一批次，不同状态，应弹出列表选择，现扫第二个不同状态的物料提示改箱码已扫描；同一箱码，同一批次，相同状态，只有一个箱码，不用弹出列表，直接扫到列表中 zhang_li 2024-08-20 11:47:26 +0800
6ced12b2d8 HL-5493PDA零件查询 - 物料名称或者描述信息过多，导致下面列表被遮挡问题 wangyufei 2024-08-20 10:54:40 +0800
0af78626a7 HL-5486PDA翻包任务增加关闭功能 wangyufei 2024-08-20 10:40:36 +0800
9cadc27594 修改翻包提示 lijuncheng 2024-08-20 10:30:00 +0800
2b02a7e51f 修改翻包提示 lijuncheng 2024-08-20 09:59:09 +0800
f11adc0d0a 修改直接上架修改库位赋值 lijuncheng 2024-08-20 09:47:56 +0800
32be976691 Merge branch 'hella_online_20240803' into master_hella 陈薪名 2024-08-19 17:35:37 +0800
ac29464db3 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-19 14:39:10 +0800
a2b558feac Merge branch 'hella_online_20240819' into hella_online_20240803 陈薪名 2024-08-19 14:38:13 +0800
b6692a8325 修改补料任务测试数据 hella_online_20240819 lijuncheng 2024-08-19 14:17:39 +0800
d6b0371037 HL-5323PDA 直接上架，扫描的事库存余额中的标签，应该在上架记录中显示物料名称 wangyufei 2024-08-19 14:14:57 +0800
7da4d1171f 修改目标库位库存状态 lijuncheng 2024-08-19 13:49:07 +0800
24fe84795c HL-5339无计划完工，超过报工数还可以在扫描，应到报工数自动提交；超过报工数提交后，返回可再次扫描，应返回主页面不能在扫扫描 zhang_li 2024-08-19 11:37:53 +0800
4482bffe6b 修改版本号 lijuncheng 2024-08-19 11:20:36 +0800
513e2da8a9 修改补料任务标签 lijuncheng 2024-08-19 11:19:52 +0800
c43c338668 修改发料、补料任务，扫父子包装限制与直接相同 lijuncheng 2024-08-19 11:13:18 +0800
77f4d90376 Merge branch 'hella_online_20240803' into master_hella 陈薪名 2024-08-19 10:10:11 +0800
c633d46ed9 修改样式 lijuncheng 2024-08-19 09:33:16 +0800
50d3e76522 修改查询提示 lijuncheng 2024-08-19 09:32:18 +0800
1df4f61591 修改直接发料和直接补料扫父子包装问题 lijuncheng 2024-08-19 09:13:16 +0800
f5e31ee1e5 修改直接发料扫描父子包装问题 lijuncheng 2024-08-18 17:54:44 +0800
7b9c272f20 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 ljc_0803 lijuncheng 2024-08-18 13:48:40 +0800
87aa66567e 修改直接发料0816 lijuncheng 2024-08-18 13:48:32 +0800
e08a8ae336 HL-5055 按计划完工，每次提交后要判断一下计划的状态，如果计划已完成提示：计划已完成，返回开工阶段 wangyufei 2024-08-18 11:51:50 +0800
8b45890360 直接发料，直接补料添加库存余额查询 lijuncheng 2024-08-18 10:00:41 +0800
994d1ca168 修改直接采购上架推荐库位校验 lijuncheng 2024-08-18 09:33:43 +0800
eb63ed4f5e 修改发料补料提交校验 lijuncheng 2024-08-17 19:49:41 +0800
b1ef7583bb 修改发料扫描校验 lijuncheng 2024-08-17 19:28:28 +0800
4495ad99bf Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-17 17:44:01 +0800
d8bb622a72 修改发料查询库存，上架修改库位 lijuncheng 2024-08-17 17:43:52 +0800
6172e62b33 增加组件 niexiting 2024-08-17 17:28:32 +0800
22e34028d2 增加组件 niexiting 2024-08-17 16:51:39 +0800
d011398ef1 HL-5364pda盲盘按库位盘，输入不是此库位的没有任何提示，应提示库位与盘点库位不一致；按物料盘点，可以盘不是要盘的物料，没有提示，应提示物料与盘点物料不一致 zhang_li 2024-08-17 16:25:30 +0800
1c11e4ea0b HL-5388 装配收货任务，扫完箱码后，点复制库位、扫库位不弹输入库位框，点扫描是扫箱码的框，应加个扫库位的框 wangyufei 2024-08-17 15:53:02 +0800
93508acd61 在开关表中增加开关：semiProductReceipCommitValidate，在预生产完工收货任务提交时根据开关校验是否要扫描目标库位，如果不扫描目标库位取任务中的目标库位，参考装配任务中的fgProductReceipCommitValidate开关 wangyufei 2024-08-17 15:38:12 +0800
91210e46a8 HL-5366 盘点任务，明盘，任务明细是相同包装、相同物料、相同库位、不同状态，盘点之后，产生记录变成相同物料、相同库位、相同状态，也都生成盘点调整 zhang_li 2024-08-17 15:31:05 +0800
d656c643eb 盘点返回之前版本 zhang_li 2024-08-17 15:21:29 +0800
895bf6c855 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 niexiting 2024-08-17 15:16:43 +0800
36fe6cb120 直接发料增加预计出的判断 niexiting 2024-08-17 15:16:32 +0800
0f194e6870 HL-5366盘点任务，明盘，任务明细是相同包装、相同物料、相同库位、不同状态，盘点之后，产生记录变成相同物料、相同库位、相同状态，也都生成盘点调整 zhang_li 2024-08-17 15:07:58 +0800
53a5156037 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-17 14:20:30 +0800
df6cf1ff23 修改发料错误 lijuncheng 2024-08-17 14:20:16 +0800
ca3dc72b15 物料隔离任务，PDA增加物料号查询功能 wangyufei 2024-08-17 14:01:03 +0800
330128d328 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 niexiting 2024-08-17 13:53:17 +0800
2f5d6c0e84 增加组件、修改直接发料功能 niexiting 2024-08-17 13:53:10 +0800
fdcf2ab346 HL-5426 PDA发料接收任务中筛选中点击重置没有清空只看当天和只看待处理结果 wangyufei 2024-08-17 13:31:54 +0800
d097282c73 HL-5359在开关表中增加开关：semiProductReceipCommitValidate，在预生产完工收货任务提交时根据开关校验是否要扫描目标库位，如果不扫描目标库位取任务中的目标库位，参考装配任务中的fgProductReceipCommitValidate开关 wangyufei 2024-08-17 13:26:37 +0800
658da25bcb Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-17 11:40:38 +0800
9e6e5b799d 发料接收提交和自动扫描一致 lijuncheng 2024-08-17 11:09:10 +0800
1c1628290c HL-5369物料隔离任务，PDA增加物料号查询功能 wangyufei 2024-08-17 11:04:20 +0800
7b5f7f91d4 预生产、装配上架校验提示 lijuncheng 2024-08-17 11:00:06 +0800
c8727798e2 添加灯码扫描校验 lijuncheng 2024-08-17 10:59:29 +0800
8b7c4acc0f 修改发料提示 lijuncheng 2024-08-17 09:11:55 +0800
a13c98f018 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 niexiting 2024-08-16 20:13:22 +0800
d88bdff7c5 修改发料0816 niexiting 2024-08-16 20:12:25 +0800
6bbef5511c HL-5420发料任务、物料任务-筛选点击“重置”按钮时，没有清空只看当天和只看待处理按钮的状态 wangyufei 2024-08-16 19:41:27 +0800
99836aca1e Merge branch 'hella_online_20240803' into master_hella 陈薪名 2024-08-16 19:37:50 +0800
7ac7b1b8a3 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 niexiting 2024-08-16 18:40:06 +0800
ff475dc920 HL-5376 聂喜婷 08-16：@王宇飞没选择生产线时给出提示：请选择生产线 wangyufei 2024-08-16 18:27:33 +0800
e3659c8500 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 niexiting 2024-08-16 18:26:47 +0800
a219065216 修改赋值 niexiting 2024-08-16 18:26:41 +0800
0838194993 Merge branch 'hella_online_20240816' into hella_online_20240803 陈薪名 2024-08-16 18:18:14 +0800
6936ef7611 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 niexiting 2024-08-16 17:58:59 +0800
3aef9849c9 增加directIssue0816 niexiting 2024-08-16 17:58:51 +0800
1a1c9874a2 检验打印单提示变添加没有检验方案和检验阶段不存在 zhang_li 2024-08-16 17:00:40 +0800
b3cc6cf0e8 修改库移 hella_online_20240816 lijuncheng 2024-08-16 16:36:27 +0800
340f99514c 修改库移校验 lijuncheng 2024-08-16 15:50:45 +0800
e0626c7d19 Merge branch 'hella_online_20240803' into master_hella 陈薪名 2024-08-16 15:40:19 +0800
b75a0bb9a8 Merge branch 'hella_online_20240816' into hella_online_20240803 陈薪名 2024-08-16 15:34:11 +0800
42e5dc42ea 发布版本 lijuncheng0816 lijuncheng 2024-08-16 15:33:09 +0800
3daf4da63a Merge branch 'hella_online_20240803' into master_hella 陈薪名 2024-08-16 15:28:44 +0800
cb15c0cf5d 修改库存转移提示 lijuncheng 2024-08-16 15:11:51 +0800
a3c4e52f0d 修改预生产上架扫描 lijuncheng 2024-08-16 15:11:33 +0800
31710c05bc 添加页面 lijuncheng 2024-08-16 15:03:10 +0800
1e82452cf9 修改库移 lijuncheng 2024-08-16 15:02:52 +0800
23c50409f4 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-16 14:58:56 +0800
61d96a6582 修改预生产上架扫描问题 lijuncheng 2024-08-16 14:57:22 +0800
110767de2a HL-4766 在WMS的登录页面和PDA的登录页面取消验证码功能 wangyufei 2024-08-16 14:50:22 +0800
908af99949 HL-5359 在开关表中增加开关：semiProductReceipCommitValidate，在预生产完工收货任务提交时根据开关校验是否要扫描目标库位，如果不扫描目标库位取任务中的目标库位，参考装配任务中的fgProductReceipCommitValidate开关 wangyufei 2024-08-16 13:10:08 +0800
7113fa4c29 HL-5275 直接移库扫描第一个箱签后，在扫描第二个时没有光标显示，需要点击扫描框才能继续扫描 wangyufei 2024-08-16 10:35:15 +0800
06bc901945 修改直接发料扫描焦点 lijuncheng 2024-08-16 09:15:03 +0800
59f793ebc0 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-16 08:52:47 +0800
22d90fa4c1 目标库位和状态都一致时不可以提交 lijuncheng 2024-08-16 08:52:34 +0800
14061c3dc9 检验打印恢复最新版本 zhang_li 2024-08-15 21:04:39 +0800
2fb8148b9f 修改发料提示 lijuncheng 2024-08-15 20:39:07 +0800
9eb9161274 检验单文字重复 zhang_li 2024-08-15 20:21:58 +0800
b21fbc2f76 检验单回退到没有提示的版本 zhang_li 2024-08-15 19:14:52 +0800
6e1ba14992 检验单提示 zhang_li 2024-08-15 17:12:53 +0800
6c59175d87 修改盘点弹框错误 lijuncheng 2024-08-15 16:13:08 +0800
87538b9e03 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 zhang_li 2024-08-15 15:43:58 +0800
6e36f0d4c1 检验申请单提示检验申请问题 zhang_li 2024-08-15 15:43:05 +0800
be34c04d36 添加版本 lijuncheng 2024-08-15 11:54:31 +0800
72c471f366 修改发料任务和发料接收 lijuncheng 2024-08-15 11:23:31 +0800
a6c5e6eff5 修改点击处理 lijuncheng 2024-08-15 10:47:20 +0800
e18ff3f478 Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803 lijuncheng 2024-08-15 08:30:35 +0800
ba7690e089 直接发料查询功能 lijuncheng 2024-08-15 08:30:07 +0800
b74b62c827 可编辑数量 wangyufei 2024-08-14 22:41:17 +0800
686a10f682 编辑数量组件封装 wangyufei 2024-08-14 22:33:03 +0800
776ffd16b1 版本 zhang_li 2024-08-14 18:53:33 +0800
12f8e803a5 添加筛选 lijuncheng 2024-08-14 18:46:29 +0800