 钮海涛
|
b396d9cfd9
|
修改枚举
|
4 years ago |
|
钮海涛
|
e918d85702
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
30048f4ce1
|
修改枚举
|
4 years ago |
puxiao.liao
|
3cf1fd642e
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
cd351e443f
|
15627 19048-喷涂条码在不同工位重复报工-20210430 ->报工表增加唯一索引:工厂代码+包装编号+原材料物料号
|
4 years ago |
|
puxiao.liao
|
840ce5c836
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
 曾贞一
|
c6e80ad9a7
|
【3391 添加报废记录报表和修改质检不良清单表-后端】
|
4 years ago |
joke.wang
|
f20e000957
|
15608 19081-返工返修-报废单据需要增加字段和数据
|
4 years ago |
陈思洁
|
2c65486bc6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
dd000b33a3
|
【15573 20027-PCN端 - 来料检验- WMS已经将数据传输到了中间接口表，但MES还未生成来料检验任务 -20210429】
【15546 20027-管理端-报表中心-首检检验结果报表-班组和班长显示错误-20210421】
|
4 years ago |
|
曾贞一
|
ac08dc110c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
a92b87f6a0
|
【3391 添加报废记录报表-后端】
|
4 years ago |
duan.yang
|
a30e97336c
|
供应商关系添加物料字段，工厂代码查询条件Bug
Signed-off-by: duan.yang <994300880@qq.com>
|
4 years ago |
 王杰
|
844349d583
|
冲突
|
4 years ago |
|
王杰
|
21a3d716f4
|
pom
|
4 years ago |
|
王杰
|
5bf5504992
|
pom
|
4 years ago |
李俊生
|
91d7b0157d
|
零件转换界面增加按钮功能
15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 按照计划时间倒序
15474 19081-报表中心，供应商到货异常到货次数查询主表添加显示字段，到货时间，单号--20210422
15471 19081-领料任务报表及明细没有拣货完成时间-20210425
|
4 years ago |
|
joke.wang
|
5193012b69
|
15527 19081-追溯汇总报表-Operator Data区域数据需要按照Time Built正序排序
|
4 years ago |
|
puxiao.liao
|
f429c08f30
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
钮海涛
|
f1159f8afb
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
ae88dda60d
|
新增MDM对象转换工具。
|
4 years ago |
|
puxiao.liao
|
3af79ea582
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
a9881bc01f
|
修复泰国产品条码统计
|
4 years ago |
|
joke.wang
|
92e0acee58
|
包装明细接口增加索引
|
4 years ago |
|
Dominic_Xiao
|
e18b726369
|
MesPackageTravelRepository 增加 Repository注解
|
4 years ago |
|
Dominic_Xiao
|
28d512021e
|
增加数据源类型字段
|
4 years ago |
simon.song
|
64d9eef5fc
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
05f805f227
|
数据迁移功能优化，支持多数据源
|
4 years ago |
|
joke.wang
|
ebd3f85255
|
泰国扭矩展示优化
|
4 years ago |
|
puxiao.liao
|
54529730e7
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
3c4c271c64
|
增加产品条码字段信息
|
4 years ago |
|
puxiao.liao
|
540ba4b9e0
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
肖奕扬
|
4025c81a8d
|
Merge pull request '产品工序报表' (#266) from frank.yu/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/266
|
4 years ago |
yumingxing
|
c5cd0d8a1d
|
产品工序报表
|
4 years ago |
许心洁
|
ab8686ae2c
|
去掉mongo依赖
|
4 years ago |
|
许心洁
|
b08ff69d37
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
陈思洁
|
a735bfc40c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
e7e0580c9a
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
4 years ago |
|
许心洁
|
c4b833a259
|
合并test分支代码
|
4 years ago |
|
Dominic_Xiao
|
10bc144c85
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
62ae1d9a13
|
包装履历新增qrCode字段，实现卡斯马报表根据工序查询历史CMS标签的功能
|
4 years ago |
|
钮海涛
|
508fd77881
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
4f697d51ec
|
演示问题修复
|
4 years ago |
|
李俊生
|
4e87b3000d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
李俊生
|
9ed1a5d36a
|
15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17
15108 19048-- 库存移动统计可以查看到历史记录 --20210417
|
4 years ago |
|
puxiao.liao
|
b6a502475a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
|
4 years ago |
|
puxiao.liao
|
505f80032c
|
导入模板下载增加是否必填字段下载
|
4 years ago |
|
陈思洁
|
91ab318854
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
a691cded53
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
4 years ago |
|
曾贞一
|
ab0e8d559b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |