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
|
5 years ago |
李俊生
|
5f52b1aa33
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
李俊生
|
206b522af5
|
pom冲突
|
5 years ago |
|
李俊生
|
adb48ef07f
|
南非收货提交后，需送检的零件后需要有送检的提示
|
5 years ago |
 曾贞一
|
54329c67ec
|
【同步BH成品条码JOB-优化】
|
5 years ago |
castle.zang
|
4fa41f2f90
|
还原pom version
|
5 years ago |
|
castle.zang
|
acfba9f367
|
修复version版本号
|
5 years ago |
|
castle.zang
|
9a4d2060b6
|
修复version版本号
|
5 years ago |
|
曾贞一
|
93c64328db
|
【修改-pom.xml】
|
5 years ago |
臧学普
|
7aa68616bc
|
Merge branch 'master' into test
|
5 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
|
5 years ago |
 钮海涛
|
7c60ce4cdc
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
b5bbf7aefb
|
增加等待时间评估规则
|
5 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
|
5 years ago |
|
李俊生
|
85dd71b1ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-screen/pom.xml
|
5 years ago |
wynne1005
|
83b4cb64df
|
merge dev
|
5 years ago |
|
钮海涛
|
f50d358cdd
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
7bd17131b5
|
牵纱拆到手工设备，包布也需要拆到手工设备。
|
5 years ago |
|
wynne1005
|
b46bd3b354
|
feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
|
5 years ago |
 廖湘明
|
e001bbecfe
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
廖湘明
|
c19d2aebd5
|
一次性通过率BUG修改
|
5 years ago |
|
puxiao.liao
|
41d09fd259
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
puxiao.liao
|
177cdd0b6e
|
库存条码表增加容器字段
|
5 years ago |
潘天虎
|
8c68b49cb6
|
Merge pull request 'ext-dev' (#267) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/267
|
5 years ago |
|
andly.pan
|
43d7195a37
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
5 years ago |
Xiao-yin0517
|
7a4ab20483
|
增加了是否禁用和启用
|
5 years ago |
陈思洁
|
23e5b87ceb
|
【15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429】
|
5 years ago |
|
钮海涛
|
4088a85a5c
|
更改左边界计算逻辑：后道工序满模即可开始。
|
5 years ago |
Dominic_Xiao
|
a0f6fa5a7e
|
15609 20135--产品工序过程查询报表--》缺陷信息--》缺陷位置--2021-04-29
|
5 years ago |
|
wynne1005
|
ac791d518a
|
fix(impp-framework): 更换redisson注入方式
更换redisson注入方式
|
5 years ago |
joke.wang
|
49f709959d
|
15711 19081-邮件提醒内容每一条之间增加换行和序号
|
5 years ago |
|
曾贞一
|
697f93a384
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
曾贞一
|
3e0df20273
|
【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情，新增wms_stock_sn.package_no字段显示+0506】
|
5 years ago |
|
钮海涛
|
3dd67766b2
|
测试时间
|
5 years ago |
|
joke.wang
|
eef6f8e18b
|
节假日 泰国
|
5 years ago |
|
puxiao.liao
|
294d34b6d3
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
puxiao.liao
|
5cf9c232b5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
dbd14c9d6e
|
导出模板字段排序维护
|
5 years ago |
|
钮海涛
|
c09a078ce4
|
获取生产计划开始时间和结束时间去除service调用。
|
5 years ago |
|
joke.wang
|
0ec0bc2592
|
15690 19108+PCN 监听工步 记录plc值
|
5 years ago |
|
joke.wang
|
db23233a8f
|
增加容器条码记录表
|
5 years ago |
|
钮海涛
|
9ace046d1d
|
修改动态拆分字段为对象关联
|
5 years ago |
Fightgoo
|
82b4c948f6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Fightgoo
|
021e05ebaf
|
15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430
|
5 years ago |
|
钮海涛
|
99b43a6677
|
修改枚举
|
5 years ago |
|
李俊生
|
efaafcdcc9
|
仓库物料统计预警
|
5 years ago |
|
joke.wang
|
b06b49866f
|
容器清空接口逻辑优化
|
5 years ago |
|
钮海涛
|
b396d9cfd9
|
修改枚举
|
5 years ago |
|
钮海涛
|
e918d85702
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
30048f4ce1
|
修改枚举
|
5 years ago |