 钮海涛
|
ffa0aa94f8
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
caafb9c317
|
修改排程计划逻辑
|
4 years ago |
汪云昊
|
2443d1d8e6
|
feat(softswitch):REST按状态码重试
|
4 years ago |
Dominic_Xiao
|
ce91ea879f
|
天津-PCN新增功能:物料校验客户标签
|
4 years ago |
许心洁
|
f363979f24
|
任务#3328
|
4 years ago |
wynne1005
|
f21c618f70
|
feat(Screen): pojo建立
pojo建立
|
4 years ago |
puxiao.liao
|
cc8d2a5441
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
simon.song
|
f73570b28e
|
漏提交代码
|
4 years ago |
|
puxiao.liao
|
f9c3fc705b
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
4ceb2b70c7
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
d129a3863b
|
天津-新注塑区域集中下件
|
4 years ago |
|
simon.song
|
2dc6a886fe
|
14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题）
|
4 years ago |
joke.wang
|
cd5773fb2e
|
绑定关键件增加显示列
|
4 years ago |
 王杰
|
e40744e65a
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
f8e0146b19
|
pom
|
4 years ago |
|
王杰
|
af11605d46
|
工步
|
4 years ago |
|
钮海涛
|
257647de0a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
0af24e4704
|
新增生产计划下发，生产计划打印功能。
|
4 years ago |
 曾贞一
|
f05c9bfaa4
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
曾贞一
|
05ce6976e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
18b9a8c6c9
|
【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】
|
4 years ago |
|
joke.wang
|
6a00f4f7f9
|
14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序
|
4 years ago |
|
汪云昊
|
46d94c051a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
汪云昊
|
af4ce0fa32
|
feat(impp):组织结构添加事业部节点
|
4 years ago |
|
钮海涛
|
1072a62f79
|
PDA首页增加目标存储区显示
|
4 years ago |
|
钮海涛
|
ec35afa34e
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
9f12a44fb6
|
完成插单功能
|
4 years ago |
|
puxiao.liao
|
aec66afa83
|
修复泰国翻包
|
4 years ago |
andly.pan
|
5859716998
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
5e98df411e
|
更改重置参数
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
|
wynne1005
|
bbb4d57abc
|
删除mongo依赖
|
4 years ago |
|
wynne1005
|
d627d024a7
|
移除mongo依赖
|
4 years ago |
|
wynne1005
|
62d9679308
|
删除mongo依赖
|
4 years ago |
|
wynne1005
|
b48f30fd47
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
汪云昊
|
960ec37cbc
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
汪云昊
|
a067683998
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
puxiao.liao
|
2da5b569a6
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
puxiao.liao
|
29ee22da5d
|
软适配定时任务的修改
|
4 years ago |
|
andly.pan
|
4261e9d34e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
andly.pan
|
faeef7b511
|
swebplanOrder增加过期字段
Signed-off-by: andly.pan <andly.pan@estsh.com>
|
4 years ago |
|
汪云昊
|
2fd80792ba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
汪云昊
|
c60daac399
|
feat(mdm):mdmhql工具调整
|
4 years ago |
|
钮海涛
|
be664bf464
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
a63334c5a1
|
去除事务sop
|
4 years ago |
|
wynne1005
|
31f26f5b4f
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
b8d254e55e
|
增加平台配置类型
|
4 years ago |
|
joke.wang
|
19872ba443
|
隔离报废
|
4 years ago |
陈思洁
|
c2dbff5d5a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
6b4ae7eb71
|
【3254 泰国-上装总成套膜标签打印】
|
4 years ago |
|
joke.wang
|
0c4e6359fc
|
JISA导入优化
|
4 years ago |
|
joke.wang
|
fbab36aad2
|
报废隔离
|
4 years ago |
|
andly.pan
|
754124ff25
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
汪云昊
|
c6031a0fc4
|
feat(softswitch):添加sap-rfc适配器
|
4 years ago |
|
wynne1005
|
6adc396aef
|
删除动态表单的元素样式类型
|
4 years ago |
|
wynne1005
|
dce748fdd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
2a63c05597
|
删除动态表单的元素样式类型
|
4 years ago |
|
wynne1005
|
4d40686be8
|
删除动态表单的元素样式类型
|
4 years ago |
|
曾贞一
|
54e691bc30
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
2e49522aec
|
【14115 20063-BH基础数据增加导出及导入功能-20210305】
|
4 years ago |
|
joke.wang
|
24aa100dfe
|
追溯总览报表
|
4 years ago |
|
wynne1005
|
1f94eee641
|
Merge branch 'dev' into test
|
4 years ago |
|
许心洁
|
ab05112dc4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
陈思洁
|
efebc6f605
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
154307b2f0
|
【泰国工位传参修改】
|
4 years ago |
|
joke.wang
|
339cbf0634
|
bug:14146 一张报表中查询产品所有追溯信息
|
4 years ago |
|
许心洁
|
4ae7700104
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
44af0f4e80
|
删除重复实体类
|
4 years ago |
|
puxiao.liao
|
5b3046f482
|
天津麦格纳BUG修复
|
4 years ago |
|
joke.wang
|
d7da6437b3
|
获取状态机dao bug修复
|
4 years ago |
|
钮海涛
|
919db8451e
|
导入问题修复
|
4 years ago |
|
王杰
|
4d81424794
|
numberrule
|
4 years ago |
|
王杰
|
5e290e81b8
|
number rule
|
4 years ago |
|
wynne1005
|
8c3a652ada
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
6318ca6afc
|
feat(form): 动态表单新增跳转详情页枚举
|
4 years ago |
|
simon.song
|
dbeb6baac7
|
14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28
|
4 years ago |
|
joke.wang
|
f01ae5106b
|
14165 返修队列增加校验
|
4 years ago |
|
钮海涛
|
7d47979fe1
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
f31071afc6
|
add export function
|
4 years ago |
|
王杰
|
6b7cfa6659
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
3cd06f5be3
|
pom
|
4 years ago |
|
许心洁
|
d223ff242d
|
BUG14132 #流程管家在重置之后开启了一个新的流程但是没有重新返回配置项信息，导致前端重置后按钮组件等消失
|
4 years ago |
|
王杰
|
04756b1a6d
|
Merge branch 'test' into dev
|
4 years ago |
|
钮海涛
|
52644c1deb
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
f10f13a8de
|
add import field
|
4 years ago |
|
puxiao.liao
|
a98066dbe8
|
接口增加字段信息
|
4 years ago |
|
王杰
|
431ee97d64
|
同步工单表
|
4 years ago |
|
王杰
|
f4e9bf4603
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
94d38bb175
|
test merge dev
|
4 years ago |
|
王杰
|
fe6940b0dc
|
编码规则扩展
|
4 years ago |
|
joke.wang
|
b505fe8456
|
13858 20027--接口表同步情况报表
|
4 years ago |
|
joke.wang
|
e2a9222b47
|
pcn登陆限制
|
4 years ago |
|
曾贞一
|
76079c9bee
|
Merge branch 'test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
|
4 years ago |
|
puxiao.liao
|
485fe13202
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
c880d51c9d
|
修复泰国翻包
|
4 years ago |
|
钮海涛
|
90169cd8b0
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
2ba2314968
|
add import field
|
4 years ago |
|
曾贞一
|
c63df1ed7f
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
0c9dff6dd8
|
不良品处理根据物料类型查询位置
|
4 years ago |
|
Dominic_Xiao
|
c1eb51dec5
|
缺陷位置新增产品类型字段
|
4 years ago |
|
王杰
|
dbc417269b
|
test merge ext-dev
|
4 years ago |