Dominic_Xiao
|
e82043a798
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
aa78fd8bd5
|
卡斯马异常锁定
|
4 years ago |
puxiao.liao
|
9333bfc996
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
fe3416a736
|
查询条件的新增
|
4 years ago |
|
Dominic_Xiao
|
27ceea4113
|
16147 20135-不良品处理扫条码点击报废去掉报废原因这个选择框--2021-06-18
|
4 years ago |
 钮海涛
|
7150f1c51f
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
eeb9ab500b
|
排程结果优化
|
4 years ago |
|
puxiao.liao
|
93906742a6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
陈思洁
|
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 |