puxiao.liao
|
54529730e7
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
puxiao.liao
|
3c4c271c64
|
增加产品条码字段信息
|
5 years ago |
|
puxiao.liao
|
540ba4b9e0
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 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
|
5 years ago |
yumingxing
|
c5cd0d8a1d
|
产品工序报表
|
5 years ago |
许心洁
|
ab8686ae2c
|
去掉mongo依赖
|
5 years ago |
|
许心洁
|
b08ff69d37
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
陈思洁
|
a735bfc40c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
e7e0580c9a
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
5 years ago |
|
许心洁
|
c4b833a259
|
合并test分支代码
|
5 years ago |
Dominic_Xiao
|
10bc144c85
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
62ae1d9a13
|
包装履历新增qrCode字段，实现卡斯马报表根据工序查询历史CMS标签的功能
|
5 years ago |
 钮海涛
|
508fd77881
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
5 years ago |
|
钮海涛
|
4f697d51ec
|
演示问题修复
|
5 years ago |
李俊生
|
4e87b3000d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
李俊生
|
9ed1a5d36a
|
15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17
15108 19048-- 库存移动统计可以查看到历史记录 --20210417
|
5 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
|
5 years ago |
|
puxiao.liao
|
505f80032c
|
导入模板下载增加是否必填字段下载
|
5 years ago |
|
陈思洁
|
91ab318854
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
a691cded53
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
5 years ago |
 曾贞一
|
ab0e8d559b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
57a9a8b4fd
|
【15334 19108+wms_doc_fg_detail到库存执行按产线处理+0419】
|
5 years ago |
|
puxiao.liao
|
c4369af269
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
陈思洁
|
4a3f379a28
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
10ad3e54bb
|
【15332 20027-PCN端 - 来料检验- 选择检验单报错 -20210421】
|
5 years ago |
joke.wang
|
8a4698bfe7
|
15284 19108+ MES无下线汇总报表
|
5 years ago |
|
钮海涛
|
63a8aef96d
|
演示问题修复
|
5 years ago |
汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
5 years ago |
|
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
5 years ago |
|
joke.wang
|
fd18ec063f
|
产品关键数据
|
5 years ago |
|
puxiao.liao
|
87f3031a3d
|
修复软适配枚举
|
5 years ago |
|
joke.wang
|
c0ff7ce986
|
订单池增加索引
|
5 years ago |
|
许心洁
|
e1f366f654
|
喜德任务#3349
|
5 years ago |
|
puxiao.liao
|
43c3f3ffa0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
许心洁
|
091a5b3678
|
流程管家重置提示+喜德任务3349
|
5 years ago |
|
许心洁
|
2684b52775
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
a24b40d8ec
|
喜德任务#3349
|
5 years ago |
|
puxiao.liao
|
988c49762b
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
puxiao.liao
|
39b716d2a1
|
修复打印异常
|
5 years ago |
|
钮海涛
|
95dffb65e0
|
新增成品检验报工
|
5 years ago |
|
钮海涛
|
736087852e
|
新增成品检验报工
|
5 years ago |
|
陈思洁
|
77f66de188
|
【14930 20027-管理端生产包装报表中增加产品二维码查询条件，可以根据产品二维查询出包装条码-20210409】
【14884 20027--控制计划--编辑中选择一行数据点击删除后，不做版本更新。-2021-04-06】
【14848 20027--控制计划--编辑中输入版本号，条件没有生效，点击查询，数据没有按照筛选条件显示查询结果-2021-04-02】
|
5 years ago |
|
钮海涛
|
33be7da477
|
新增成品检验报工
|
5 years ago |
|
钮海涛
|
4590133c27
|
新增成品检验报工
|
5 years ago |
|
puxiao.liao
|
b7b79bd1b5
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
5 years ago |
|
github33
|
4854673754
|
14850 20027-mes查询 wms的熔深batch的接口-20210409
|
5 years ago |
wynne1005
|
9c4b233975
|
refactor(core): 支持用户密码过期
Finish 21.4.8
|
5 years ago |
|
wynne1005
|
afc0138e83
|
refactor(core): 支持用户密码过期
commit1 21.4.7
|
5 years ago |
|
github33
|
be26c0920f
|
14850 20027-mes查询 wms的熔深batch的接口-20210409
|
5 years ago |