陈思洁
|
ee42edc94c
|
【3484 20063-待处理报工基础数据-20210610】
|
4 years ago |
puxiao.liao
|
66fb8e5894
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
9cfcb2a59d
|
查询条件的增加&PO增加库存地字段
|
4 years ago |
wynne1005
|
321209f2b4
|
Merge branch 'test' into ext-dev
|
4 years ago |
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
wynne1005
|
69d872be7e
|
Merge branch 'dev' into test
|
4 years ago |
wynne1005
|
7aa3d4bddf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
wynne1005
|
2b0a7198a5
|
fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
|
4 years ago |
puxiao.liao
|
2acc57e72d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
joke.wang
|
470b05ebf0
|
北京ptl亮灯
|
4 years ago |
rock.yu
|
38126d9812
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
|
4 years ago |
rock.yu
|
40fc186ed6
|
BOM, Locate POJO 增加索引
|
4 years ago |
王杰
|
a321a28759
|
Merge branch 'test' into ext-dev
|
4 years ago |
Dominic_Xiao
|
5bf2121c92
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
Dominic_Xiao
|
778df56d2e
|
16217 20135--增加料架需要跟生产线绑定关系--2021-06-08
16162 20135--自动操作增加工号扫码(在每一个工位第一步扫码工号,每操作一次需要扫描一次工号)--2021-06-28
16152 20135--异常锁定,解锁和解锁记录--2021-06-25
|
4 years ago |
王杰
|
4fe445e4c3
|
test merge dev
|
4 years ago |
陈思洁
|
ce8a66d83a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
4d5cdc710e
|
【16023 19081-部分工位安灯呼叫没有反应、呼叫成功无法取消和处理-20210525】
|
4 years ago |
puxiao.liao
|
582f4ba81a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
7125556090
|
盘点查询增加状态查询
|
4 years ago |
曾贞一
|
561717b7a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
曾贞一
|
8b4bd8d8ab
|
【中航-优化委外发运业务】
|
4 years ago |
puxiao.liao
|
4d5888ae36
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
1835890e4c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
d952e7a8e9
|
采购收货进度报表增加列查询,窗口开始时间,窗口结束时间
|
4 years ago |
puxiao.liao
|
2f903e07fa
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
224e3a9a51
|
字段和枚举的新增
|
4 years ago |
puxiao.liao
|
de75b43008
|
增加质检枚举信息
|
4 years ago |
puxiao.liao
|
590c433b89
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
c67f263e5d
|
卡斯马不良品处理格式化代码
|
4 years ago |
joke.wang
|
cda0f670eb
|
16198 19081-工位工时统计
|
4 years ago |
joke.wang
|
110cc85b6e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
wynne1005
|
261d5b3655
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
puxiao.liao
|
a8b163261d
|
mysql 版本修改
|
4 years ago |
puxiao.liao
|
46085f9051
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
钮海涛
|
81bbe8476a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
6e6b0a7c11
|
排程结果优化
|
4 years ago |
puxiao.liao
|
b31342c5db
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Xiao-yin0517
|
e7f5397e59
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
Xiao-yin0517
|
b9bae06c0c
|
更改实体字段,添加实体
|
4 years ago |
puxiao.liao
|
2580841944
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
808f60a64a
|
代码优化
|
4 years ago |
wynne1005
|
2f1b184e9f
|
fix(impp): 格式化
格式化
|
4 years ago |
joke.wang
|
a271672ff5
|
产品追溯报表优化
|
4 years ago |
puxiao.liao
|
0d73e0797e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
ba00df95f2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
puxiao.liao
|
d71434851c
|
增加库位名称
|
4 years ago |
潘天虎
|
5d05083665
|
Merge pull request 'ext-dev' (#276) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/276
|
4 years ago |
andly.pan
|
8b9883d2f7
|
增加邮件和字段属性
|
4 years ago |
wynne1005
|
4f74fdaa3d
|
密码过期策略加入安全策略
|
4 years ago |
puxiao.liao
|
e0083530f0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
96ea96f0a2
|
模板明细增加是否导出模板excel 头
|
4 years ago |
puxiao.liao
|
c42a4b250d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Xiao-yin0517
|
a47b8d1785
|
syncDataId改为string类型
|
4 years ago |
joke.wang
|
5eae801feb
|
16073 19081-看板管理-产量看板-产量看板调整
|
4 years ago |
曾贞一
|
00a12b8a1c
|
【15902 19125+ASN业务收货条码,收货完成后。在打印中心-条码打印状态标记为已打印+0519】
|
4 years ago |
Xiao-yin0517
|
d74e2f053d
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
|
4 years ago |
潘天虎
|
1cc6fcaa9a
|
Merge pull request 'ext-dev' (#275) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/275
|
4 years ago |
andly.pan
|
44bbc798c1
|
Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev
|
4 years ago |
andly.pan
|
dfa897720e
|
Mdm增加repo
|
4 years ago |
andly.pan
|
e66c99e509
|
Mdm修改
|
4 years ago |
puxiao.liao
|
52bb4fe82f
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Xiao-yin0517
|
0f406c54b8
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
|
4 years ago |
Xiao-yin0517
|
c4b82c4891
|
更改通过同步数据
|
4 years ago |
潘天虎
|
8366905f58
|
Merge pull request 'ext-dev' (#274) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/274
|
4 years ago |
andly.pan
|
8abe9cb030
|
新增动态配置
|
4 years ago |
钮海涛
|
c4660251cd
|
优化资源评估中间计算结果。
|
4 years ago |
andly.pan
|
19767dfcc9
|
Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev
|
4 years ago |
andly.pan
|
f2cca59ee5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
andly.pan
|
46debfb7fb
|
Mdm增加字段
|
4 years ago |
andly.pan
|
4890eb87a3
|
Mdm增加字段配置
|
4 years ago |
simon.song
|
aa3d3ff674
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
simon.song
|
dd7657d7e1
|
数据迁移功能优化
|
4 years ago |
钮海涛
|
3d66e54cea
|
优化资源评估中间计算结果。
|
4 years ago |
陈思洁
|
3fa05bc816
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
1f84c2f8aa
|
【15872 20027--PCN端工位扫描增加数据复核工步,校验采集的数据完整性和数据质量是否合格--2021-05-22】
|
4 years ago |
钮海涛
|
463f910b7a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
3a3bdc664a
|
修复工作左边界计算问题
|
4 years ago |
simon.song
|
e4c94df17c
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
simon.song
|
83e33e2403
|
代码还原
|
4 years ago |
Xiao-yin0517
|
2d2faaaa4c
|
更改实体类
|
4 years ago |
andly.pan
|
3dca058857
|
Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev
|
4 years ago |
andly.pan
|
0453e33e8f
|
和外部系统同步数据
|
4 years ago |
王杰
|
c7a62d52b5
|
Merge branch 'test' into ext-dev
|
4 years ago |
王杰
|
a0f4fef78d
|
Merge branch 'dev' into test
|
4 years ago |
王杰
|
bddf876ee3
|
工位展示组件 增加 doFunction 方法
|
4 years ago |
李俊生
|
804f9240cc
|
零星出库单需要增加出库原因、部门、领用人(前3个调用枚举)、项目号(调用项目信息)
零星入库单 增加入库原因
|
4 years ago |
simon.song
|
e8fdaa58be
|
15872 20027--PCN端工位扫描增加数据复核工步,校验采集的数据完整性和数据质量是否合格--2021-05-22 simon.song 2021/5/24 下午6:14
|
4 years ago |
simon.song
|
17a61b2c2b
|
15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429
|
4 years ago |
simon.song
|
792d4263c5
|
接口表增加同步标识,kettle同步工具使用
|
4 years ago |
simon.song
|
95029f6abd
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
simon.song
|
32e4bb4ba7
|
15872 20027--PCN端工位扫描增加数据复核工步,校验采集的数据完整性和数据质量是否合格--2021-05-22
|
4 years ago |
王杰
|
4fdab21958
|
Merge branch 'test' into ext-dev
|
4 years ago |
王杰
|
15dc951bf1
|
dev merge test
|
4 years ago |
王杰
|
56ed9e73f2
|
ctno 增加 同步标志 松下wms接口映射需要此字段
|
4 years ago |
王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
王杰
|
ab1bc23eb7
|
Merge branch 'test' into dev
|
4 years ago |
王杰
|
ae71f6a008
|
状态机 - 增加逻辑
|
4 years ago |
Dominic_Xiao
|
40d7dbff22
|
15957 20027-PCN端-来料检验&发货检验-影藏过程条码列&判定结果要展示出来-20210521
|
4 years ago |
Xiao-yin0517
|
6f1b047725
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
Xiao-yin0517
|
1696ba05e3
|
更改实体类
|
4 years ago |
andly.pan
|
95d72cf4af
|
库存交易条码新增字段(同步仪征)
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
Dominic_Xiao
|
524a766dd5
|
中航SPC表新增零件号字段
|
4 years ago |
wynne1005
|
95ac5f0ee3
|
feat(screen): jdbc拼接初步完成 待整理代码
jdbc拼接初步完成 待整理代码
|
4 years ago |
puxiao.liao
|
c05cb37dff
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
castle.zang
|
8ef28595ab
|
bug 动态表单工厂隔离:增加组织隔离属性ID
|
4 years ago |
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
puxiao.liao
|
eb8f03cf19
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
|
4 years ago |
李俊生
|
5f52b1aa33
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
李俊生
|
adb48ef07f
|
南非收货提交后,需送检的零件后需要有送检的提示
|
4 years ago |
曾贞一
|
54329c67ec
|
【同步BH成品条码JOB-优化】
|
4 years ago |
castle.zang
|
4fa41f2f90
|
还原pom version
|
4 years ago |
castle.zang
|
9a4d2060b6
|
修复version版本号
|
4 years ago |
曾贞一
|
93c64328db
|
【修改-pom.xml】
|
4 years ago |
臧学普
|
7aa68616bc
|
Merge branch 'master' into test
|
4 years ago |
肖奕扬
|
62505fa7b7
|
Merge pull request '一次性通过率BUG修改' (#268) from xiangming.liao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/268
|
4 years ago |
钮海涛
|
7c60ce4cdc
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
b5bbf7aefb
|
增加等待时间评估规则
|
4 years ago |
puxiao.liao
|
48d2f6680a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-screen/pom.xml
|
4 years ago |
李俊生
|
85dd71b1ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-screen/pom.xml
|
4 years ago |
wynne1005
|
83b4cb64df
|
merge dev
|
4 years ago |
钮海涛
|
f50d358cdd
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
7bd17131b5
|
牵纱拆到手工设备,包布也需要拆到手工设备。
|
4 years ago |
wynne1005
|
b46bd3b354
|
feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
|
4 years ago |
廖湘明
|
e001bbecfe
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
廖湘明
|
c19d2aebd5
|
一次性通过率BUG修改
|
4 years ago |
puxiao.liao
|
41d09fd259
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
177cdd0b6e
|
库存条码表增加容器字段
|
4 years ago |
andly.pan
|
43d7195a37
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
Xiao-yin0517
|
7a4ab20483
|
增加了是否禁用和启用
|
4 years ago |
陈思洁
|
23e5b87ceb
|
【15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429】
|
4 years ago |
钮海涛
|
4088a85a5c
|
更改左边界计算逻辑:后道工序满模即可开始。
|
4 years ago |
Dominic_Xiao
|
a0f6fa5a7e
|
15609 20135--产品工序过程查询报表--》缺陷信息--》缺陷位置--2021-04-29
|
4 years ago |
wynne1005
|
ac791d518a
|
fix(impp-framework): 更换redisson注入方式
更换redisson注入方式
|
4 years ago |
joke.wang
|
49f709959d
|
15711 19081-邮件提醒内容每一条之间增加换行和序号
|
4 years ago |
曾贞一
|
697f93a384
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
曾贞一
|
3e0df20273
|
【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情,新增wms_stock_sn.package_no字段显示+0506】
|
4 years ago |
钮海涛
|
3dd67766b2
|
测试时间
|
4 years ago |
joke.wang
|
eef6f8e18b
|
节假日 泰国
|
4 years ago |
puxiao.liao
|
294d34b6d3
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
5cf9c232b5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
puxiao.liao
|
dbd14c9d6e
|
导出模板字段排序维护
|
4 years ago |
钮海涛
|
c09a078ce4
|
获取生产计划开始时间和结束时间去除service调用。
|
4 years ago |
joke.wang
|
0ec0bc2592
|
15690 19108+PCN 监听工步 记录plc值
|
4 years ago |
joke.wang
|
db23233a8f
|
增加容器条码记录表
|
4 years ago |
钮海涛
|
9ace046d1d
|
修改动态拆分字段为对象关联
|
4 years ago |
Fightgoo
|
82b4c948f6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
Fightgoo
|
021e05ebaf
|
15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430
|
4 years ago |
钮海涛
|
99b43a6677
|
修改枚举
|
4 years ago |
李俊生
|
efaafcdcc9
|
仓库物料统计预警
|
4 years ago |
joke.wang
|
b06b49866f
|
容器清空接口逻辑优化
|
4 years ago |
钮海涛
|
b396d9cfd9
|
修改枚举
|
4 years ago |
钮海涛
|
e918d85702
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
30048f4ce1
|
修改枚举
|
4 years ago |
曾贞一
|
60408db7b0
|
【15642 19108+wms_printing_queue 新增 part_no 字段+0429】
|
4 years ago |
puxiao.liao
|
3cf1fd642e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
cd351e443f
|
15627 19048-喷涂条码在不同工位重复报工-20210430 ->报工表增加唯一索引:工厂代码+包装编号+原材料物料号
|
4 years ago |
曾贞一
|
c6e80ad9a7
|
【3391 添加报废记录报表和修改质检不良清单表-后端】
|
4 years ago |
joke.wang
|
f20e000957
|
15608 19081-返工返修-报废单据需要增加字段和数据
|
4 years ago |
陈思洁
|
2c65486bc6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
dd000b33a3
|
【15573 20027-PCN端 - 来料检验- WMS已经将数据传输到了中间接口表,但MES还未生成来料检验任务 -20210429】
【15546 20027-管理端-报表中心-首检检验结果报表-班组和班长显示错误-20210421】
|
4 years ago |
andly.pan
|
6989180c2a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
曾贞一
|
ac08dc110c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
曾贞一
|
a92b87f6a0
|
【3391 添加报废记录报表-后端】
|
4 years ago |
wynne1005
|
1323569c56
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
wynne1005
|
0c860de567
|
feat(SCREEN): 数据对象操作 1
数据对象操作 1
|
4 years ago |
duan.yang
|
a30e97336c
|
供应商关系添加物料字段,工厂代码查询条件Bug
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
王杰
|
844349d583
|
冲突
|
4 years ago |
王杰
|
21a3d716f4
|
pom
|
4 years ago |
王杰
|
5bf5504992
|
pom
|
4 years ago |
李俊生
|
91d7b0157d
|
零件转换界面增加按钮功能
15241 19081 ——北京麦格纳采购订货进度报表看板需排序,2021-04-17 按照计划时间倒序
15474 19081-报表中心,供应商到货异常到货次数查询主表添加显示字段,到货时间,单号--20210422
15471 19081-领料任务报表及明细没有拣货完成时间-20210425
|
4 years ago |
joke.wang
|
5193012b69
|
15527 19081-追溯汇总报表-Operator Data区域数据需要按照Time Built正序排序
|
4 years ago |
钮海涛
|
f1159f8afb
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
ae88dda60d
|
新增MDM对象转换工具。
|
4 years ago |
puxiao.liao
|
a9881bc01f
|
修复泰国产品条码统计
|
4 years ago |
joke.wang
|
92e0acee58
|
包装明细接口增加索引
|
4 years ago |
Dominic_Xiao
|
e18b726369
|
MesPackageTravelRepository 增加 Repository注解
|
4 years ago |
Dominic_Xiao
|
28d512021e
|
增加数据源类型字段
|
4 years ago |
simon.song
|
64d9eef5fc
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
simon.song
|
05f805f227
|
数据迁移功能优化,支持多数据源
|
4 years ago |
joke.wang
|
ebd3f85255
|
泰国扭矩展示优化
|
4 years ago |
puxiao.liao
|
54529730e7
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
puxiao.liao
|
3c4c271c64
|
增加产品条码字段信息
|
4 years ago |
肖奕扬
|
4025c81a8d
|
Merge pull request '产品工序报表' (#266) from frank.yu/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/266
|
4 years ago |
yumingxing
|
c5cd0d8a1d
|
产品工序报表
|
4 years ago |
许心洁
|
ab8686ae2c
|
去掉mongo依赖
|
4 years ago |
许心洁
|
b08ff69d37
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
陈思洁
|
a735bfc40c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
e7e0580c9a
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态,故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
4 years ago |
许心洁
|
c4b833a259
|
合并test分支代码
|
4 years ago |
Dominic_Xiao
|
10bc144c85
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
Dominic_Xiao
|
62ae1d9a13
|
包装履历新增qrCode字段,实现卡斯马报表根据工序查询历史CMS标签的功能
|
4 years ago |
钮海涛
|
508fd77881
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
4f697d51ec
|
演示问题修复
|
4 years ago |
李俊生
|
4e87b3000d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
李俊生
|
9ed1a5d36a
|
15241 19081 ——北京麦格纳采购订货进度报表看板需排序,2021-04-17
15108 19048-- 库存移动统计可以查看到历史记录 --20210417
|
4 years ago |
puxiao.liao
|
505f80032c
|
导入模板下载增加是否必填字段下载
|
4 years ago |
陈思洁
|
91ab318854
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
a691cded53
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态,故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
4 years ago |
曾贞一
|
ab0e8d559b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
曾贞一
|
57a9a8b4fd
|
【15334 19108+wms_doc_fg_detail到库存执行按产线处理+0419】
|
4 years ago |
陈思洁
|
4a3f379a28
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
10ad3e54bb
|
【15332 20027-PCN端 - 来料检验- 选择检验单报错 -20210421】
|
4 years ago |
joke.wang
|
8a4698bfe7
|
15284 19108+ MES无下线汇总报表
|
4 years ago |
钮海涛
|
63a8aef96d
|
演示问题修复
|
4 years ago |
汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
4 years ago |
joke.wang
|
fd18ec063f
|
产品关键数据
|
4 years ago |
puxiao.liao
|
87f3031a3d
|
修复软适配枚举
|
4 years ago |
joke.wang
|
c0ff7ce986
|
订单池增加索引
|
4 years ago |
许心洁
|
e1f366f654
|
喜德任务#3349
|
4 years ago |
许心洁
|
091a5b3678
|
流程管家重置提示+喜德任务3349
|
4 years ago |
许心洁
|
2684b52775
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
许心洁
|
a24b40d8ec
|
喜德任务#3349
|
4 years ago |
puxiao.liao
|
39b716d2a1
|
修复打印异常
|
4 years ago |
钮海涛
|
95dffb65e0
|
新增成品检验报工
|
4 years ago |
钮海涛
|
736087852e
|
新增成品检验报工
|
4 years ago |
陈思洁
|
77f66de188
|
【14930 20027-管理端生产包装报表中增加产品二维码查询条件,可以根据产品二维查询出包装条码-20210409】
【14884 20027--控制计划--编辑中选择一行数据点击删除后,不做版本更新。-2021-04-06】
【14848 20027--控制计划--编辑中输入版本号,条件没有生效,点击查询,数据没有按照筛选条件显示查询结果-2021-04-02】
|
4 years ago |
钮海涛
|
33be7da477
|
新增成品检验报工
|
4 years ago |
钮海涛
|
4590133c27
|
新增成品检验报工
|
4 years ago |
github33
|
4854673754
|
14850 20027-mes查询 wms的熔深batch的接口-20210409
|
4 years ago |
wynne1005
|
9c4b233975
|
refactor(core): 支持用户密码过期
Finish 21.4.8
|
4 years ago |
wynne1005
|
afc0138e83
|
refactor(core): 支持用户密码过期
commit1 21.4.7
|
4 years ago |
github33
|
be26c0920f
|
14850 20027-mes查询 wms的熔深batch的接口-20210409
|
4 years ago |
puxiao.liao
|
6030c67021
|
打印数据查询修改
|
4 years ago |
github33
|
63dc4a2f9f
|
14850 20027-mes查询 wms的熔深batch的接口-20210409
|
4 years ago |
钮海涛
|
984f772788
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
8b75ed1cfc
|
新增报工功能
|
4 years ago |
曾贞一
|
f15f85b56d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
6ffd586274
|
【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】
|
4 years ago |
曾贞一
|
b688f4aff5
|
【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】
|
4 years ago |
wynne1005
|
5b003a613b
|
screen修改关系表名 增加历史表
|
4 years ago |
puxiao.liao
|
93226dd915
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
eacbdbaa7d
|
20027--MES看板-班组数来源班组信息,需要班组信息中增加一个字段来维护班组人数-2021-04-02
|
4 years ago |
钮海涛
|
543433bfff
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
钮海涛
|
9ee464f67e
|
新增报工功能
|
4 years ago |
joke.wang
|
bddd4b37a2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
joke.wang
|
52b2ea43da
|
14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值
|
4 years ago |
陈思洁
|
2b2761ade2
|
【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】
|
4 years ago |
joke.wang
|
ca8bfd3f53
|
泰国扭矩采集
|
4 years ago |
wynne1005
|
64c2ed920f
|
修改通用界面端口 还原第三方数据库连接字符串中的时区
|
4 years ago |
wynne1005
|
0ba5c62931
|
Merge branch 'screen' into dev
|
4 years ago |
wynne1005
|
714a32a994
|
first commit
|
4 years ago |
Dominic_Xiao
|
f12c568119
|
天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值
|
4 years ago |
Dominic_Xiao
|
cc86a60ba7
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
Dominic_Xiao
|
9eba8f1683
|
天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段
|
4 years ago |
joke.wang
|
072bc431fb
|
扭矩采集
|
4 years ago |
shun
|
1fbccdcf40
|
查询移库单增加供应商名称
|
4 years ago |