puxiao.liao
|
d7b34facf0
|
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-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/pom.xml
modules/i3plus-pojo-mes-pcn/pom.xml
modules/i3plus-pojo-mes/pom.xml
modules/i3plus-pojo-model/pom.xml
modules/i3plus-pojo-platform/pom.xml
modules/i3plus-pojo-ptl/pom.xml
modules/i3plus-pojo-report/pom.xml
modules/i3plus-pojo-screen/pom.xml
modules/i3plus-pojo-softswitch/pom.xml
modules/i3plus-pojo-sweb/pom.xml
modules/i3plus-pojo-wms/pom.xml
modules/i3plus-pojo-workflow/pom.xml
pom.xml
sonar-project.properties
|
4 years ago |
joke.wang
|
db9dcabf1f
|
报工表增加索引
|
4 years ago |
Dominic_Xiao
|
69e2f819f2
|
16891 19081-EOL看板-19:00至00:00显示数据为0-20210730
|
4 years ago |
|
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
|
puxiao.liao
|
e44798bd4a
|
代码合并
|
4 years ago |
Wynne
|
7de40e37f5
|
Merge branch 'dev' into test
|
4 years ago |
|
Wynne
|
bd3dcbac3a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
Wynne
|
0dd2f3b3c3
|
通用界面 requestmodel修改方法组id
|
4 years ago |
|
puxiao.liao
|
af21429f34
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
14b78e5d62
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
4b1228fbbc
|
代码回滚
|
4 years ago |
castle.zang
|
f6d32bf1e0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
castle.zang
|
987ecdc447
|
方法添加描述
|
4 years ago |
nies
|
553eab4a29
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
nies
|
fc8e25ecdd
|
bsp 注册参数增加方法的描述
|
4 years ago |
jun
|
9fbab37630
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
jun
|
aaa85e0de3
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
858f644593
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
91bd3d9021
|
北京隔离报废打印
|
4 years ago |
 钮海涛
|
8b3bdc40fe
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
c8074d219a
|
延期订单问题修复
|
4 years ago |
|
jun
|
472504f4a8
|
移除华域代码
|
4 years ago |
|
Dominic_Xiao
|
e225dc345e
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
5a44baf73a
|
北京报废打印变更
|
4 years ago |
|
puxiao.liao
|
ae81019c8c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
jun
|
9c9e8860d0
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
jun
|
84f686b54e
|
华域零星入库新增包装代码字段
|
4 years ago |
|
castle.zang
|
0b6ef98123
|
演示参数修改
|
4 years ago |
|
puxiao.liao
|
c4a691ecb9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
jun
|
20029216ea
|
16919 19081-生产报废单无法打印
|
4 years ago |
|
jun
|
1b3b5ea6a5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
21a3e58b0c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
nies
|
3bfb61178b
|
修改MES_QC_CHECK_TYPE
|
4 years ago |
|
nies
|
88781e7831
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
4850f4ccc2
|
新增tms的SOFT_TYPE
|
4 years ago |
|
jun
|
d0c62b9b2d
|
16909 19081-生产报废单导入XLS后，单据类型是【隔离报废】，而不是正常的【生产报废单】
|
4 years ago |
|
puxiao.liao
|
b44e02cdf6
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
54732f8fd1
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
puxiao.liao
|
d1a9fe37cd
|
修复盘点调差BUG
|
4 years ago |
|
钮海涛
|
96c319d848
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
0bd75ba2fe
|
订单未完全下发最大间隔限制
|
4 years ago |
宋双双
|
2ae59954d7
|
Merge pull request 'test' (#282) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/282
|
4 years ago |
jhh2579
|
54279d43ff
|
中航工序外协检
|
4 years ago |
|
jhh2579
|
9dac40797a
|
中航工序外协检-2
|
4 years ago |
|
jhh2579
|
f4e6c63956
|
中航工序外协检
|
4 years ago |
|
castle.zang
|
563cbab713
|
bsp 修改pojo
|
4 years ago |
|
castle.zang
|
756b41e393
|
bsp 修改pojo,添加icloud
|
4 years ago |
|
puxiao.liao
|
df80f5d2bf
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
4de836b28a
|
质检明细状态增加选别
|
4 years ago |
|
nies
|
51160a4586
|
更新用户导入model
|
4 years ago |