8764 Commits (3d66e54ceafbf96682c754ec08bb84a68668fd4f)
 

Author SHA1 Message Date
puxiao.liao 39b716d2a1 修复打印异常 4 years ago
钮海涛 95dffb65e0 新增成品检验报工 4 years ago
钮海涛 736087852e 新增成品检验报工 4 years ago
陈思洁 77f66de188 【14930 20027-管理端生产包装报表中增加产品二维码查询条件,可以根据产品二维查询出包装条码-20210409】
【14884 20027--控制计划--编辑中选择一行数据点击删除后,不做版本更新。-2021-04-06】
【14848 20027--控制计划--编辑中输入版本号,条件没有生效,点击查询,数据没有按照筛选条件显示查询结果-2021-04-02】
4 years ago
钮海涛 33be7da477 新增成品检验报工 4 years ago
钮海涛 4590133c27 新增成品检验报工 4 years ago
puxiao.liao b7b79bd1b5 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
github33 4854673754 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
wynne1005 9c4b233975 refactor(core): 支持用户密码过期
Finish 21.4.8
4 years ago
wynne1005 afc0138e83 refactor(core): 支持用户密码过期
commit1 21.4.7
4 years ago
github33 be26c0920f 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
puxiao.liao 6030c67021 打印数据查询修改 4 years ago
github33 63dc4a2f9f 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
钮海涛 984f772788 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 8b75ed1cfc 新增报工功能 4 years ago
曾贞一 f15f85b56d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 6ffd586274 【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】 4 years ago
曾贞一 b688f4aff5 【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】 4 years ago
wynne1005 5b003a613b screen修改关系表名 增加历史表 4 years ago
puxiao.liao 93226dd915 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao eacbdbaa7d 20027--MES看板-班组数来源班组信息,需要班组信息中增加一个字段来维护班组人数-2021-04-02 4 years ago
钮海涛 543433bfff Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 9ee464f67e 新增报工功能 4 years ago
joke.wang bddd4b37a2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
joke.wang 52b2ea43da 14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值 4 years ago
陈思洁 2b2761ade2 【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】 4 years ago
joke.wang ca8bfd3f53 泰国扭矩采集 4 years ago
wynne1005 64c2ed920f 修改通用界面端口 还原第三方数据库连接字符串中的时区 4 years ago
wynne1005 0ba5c62931 Merge branch 'screen' into dev 4 years ago
wynne1005 714a32a994 first commit 4 years ago
Dominic_Xiao f12c568119 天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值 4 years ago
Dominic_Xiao cc86a60ba7 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao 9eba8f1683 天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段 4 years ago
joke.wang 072bc431fb 扭矩采集 4 years ago
shun 1fbccdcf40 查询移库单增加供应商名称 4 years ago
simon.song 3c6a7b410d Merge remote-tracking branch 'origin/test' into test 4 years ago
simon.song 5554bfd14c 14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17 4 years ago
puxiao.liao 2adc935bb0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
 Conflicts:
	modules/i3plus-pojo-mes-pcn/pom.xml
	sonar-project.properties
4 years ago
钮海涛 23f6f9285b 增加4车间补满模逻辑 4 years ago
许心洁 4f919011dc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
github33 9a4aae9f68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
github33 a61f2c1778 CYCLE_RULE--新增枚举 4 years ago
王杰 f3b0998315 Merge pull request '状态机优化' (#265) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/265
4 years ago
王杰 38d03b1060 状态机优化 4 years ago
wynne1005 7767630fbb tmp 4 years ago
wynne1005 15633bc28e tmp 4 years ago
陈思洁 9e0d03629c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 281957a6f5 【3324 泰国-扭矩采集 --PC端后端】 4 years ago
joke.wang 3d0d39ac1d Tha扭矩采集 4 years ago
陈思洁 ccf221f80b 【pojo改名字】 4 years ago