 钮海涛
|
3d66e54cea
|
优化资源评估中间计算结果。
|
4 years ago |
|
钮海涛
|
463f910b7a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
3a3bdc664a
|
修复工作左边界计算问题
|
4 years ago |
Xiao-yin0517
|
2d2faaaa4c
|
更改实体类
|
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 |
|
王杰
|
7a39ef9a35
|
sonar
|
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 |
|
王杰
|
3dd48c3924
|
Merge pull request '状态机 - 增加逻辑' (#272) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/272
|
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 |
潘天虎
|
c9713d26ec
|
Merge pull request '库存交易条码新增字段（同步仪征）' (#271) from andly.pan/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/271
|
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
|
acfba9f367
|
修复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 |