I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,567 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '763d72b128'
${ noResults }
Commit Graph

5246 Commits (763d72b128eb9037a4208a4eddb22743e2f35517)

Author SHA1 Message Date
贾文涛 abf5d3eeb9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
puxiao.liao b626989e63 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
puxiao.liao 3a7d7a7924 bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口，当接收到数据时，需要在系统中生成一个标签，然后自动对该标签进行报工操作，接口中包含了条码，零件信息。】 5 years ago
曾贞一 58053f4972 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 56c1bf8c44 【7648 在发运界面增加一个打开单据按钮。】 5 years ago
钮海涛 cf0db5b8da Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev 5 years ago
wynne1005 06551fdd66 还原pom 5 years ago
zcg 9ca3a819b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 9d5567f4a6 Merge branch 'test' into dev 5 years ago
许心洁 a22d3d2333 动态查询：#任务1352(合并代码解决冲突) 5 years ago
许心洁 030f2948fb 动态查询：#任务1352 5 years ago
王杰 e3a9defdab 任务1528，生成并打印门锁标签 5 years ago
zcg 98787953ec 【MesPcnEnum 枚举修改】 5 years ago
wynne1005 6336ebd8e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 8b750e6a76 修改生产数据类型 5 years ago
puxiao.liao 8273a93520 Merge remote-tracking branch 'upstream/test' into test 5 years ago
puxiao.liao f2c41fc0a6 bug7800【7800 移库单导出时报错导出失败】 5 years ago
王杰 0ca8502751 任务：1518 5 years ago
袁津哲 01b685a4c8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 0c3d14a3f9 wms插件枚举新增按钮增强插件类型 5 years ago
王杰 f005489b61 ptl 5 years ago
王杰 a9a7d78bd5 解决冲突 5 years ago
joke.wang 9d55a2a8b3 [解决冲突1] 5 years ago
joke.wang 8b681af622 [解决冲突] 5 years ago
joke.wang 045dc01479 [任务：1479 料架条码打印] 5 years ago
王杰 f578311f55 数据复核 5 years ago
袁津哲 f3b7ae8bc5 优化WmsPDA插件实体，去掉本地文件夹维护 5 years ago
wei.peng 549f2ff797 授权拦截功能完成 . 5 years ago
袁津哲 ab794aab0b 开发WMS动态加载插件功能 5 years ago
袁津哲 35a4c9039a Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
袁津哲 2a0204ad99 开发WMS动态加载插件功能 5 years ago
qianhs 564ba1e116 【1472 工步-设备状态采集（原PLC采集【设备状态】）】 5 years ago
qianhs c53999b0d2 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 99ecde38d2 【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】 5 years ago
曾贞一 a98f598acc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 10b5885ede 【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】 5 years ago
joke.wang 79788daf8b pom 修改 5 years ago
zcg 74e4aa953b 【任务 1480 照片采集】 5 years ago
joke lin 62cee148cd [bug: 7875 客户JIT生产工单] 5 years ago
钮海涛 9da6628884 Merge branch 'master' into test 5 years ago
陈思洁 cc207240b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 bacab3fb88 【MES_新增设备工装关系和工装操作记录pojo】 5 years ago
puxiao.liao 4c199ce8ba 任务1470【 1470 504 北京麦格纳-采购收货--新增扫描二维码组件】 
任务1467【1467 506 北京麦格纳-推荐入库-新增推荐动态库位组件】
 5 years ago
曾贞一 3d913456af 【7863 修改单据两步法操作后，单据条码明细直接变为已完成的问题】 5 years ago
宋军超 628b0ee081 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 1690c9567b 添加调用MES接口发送完成信号 和 根据主任务编号生成区域任务组件 5 years ago
王杰 9f8e51830e mes enum 5 years ago
qianhs 8d18c61d63 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
joke lin 126440c976 [任务：1435 客户JIT导入] 5 years ago
陈思洁 736b292d83 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 310bf49af6 【MES_校验是否换膜并推送换模信号 】 5 years ago
陈思洁 22788f1c44 还原POM文件TEST-DEV 5 years ago
宋军超 d094824c4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 6bdf815329 区域组件调用参数实体添加(状态代码statusCode)字段 5 years ago
qianhs a93882c881 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
许心洁 8178e90abd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 5bf7133ff1 动态查询：BUG#7845；BUG#7676；BUG#7675 5 years ago
袁津哲 df21c218cd Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b08d20fdb6 开发WMS动态加载插件功能 5 years ago
王杰 f5e4bba761 ptlpcnenum 5 years ago
曾贞一 5291d5d13d 【7838 修改分组管理中的按钮名称】 5 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 5 years ago
袁津哲 c178540545 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 327af15040 开发WMS动态加载插件功能 5 years ago
qianhs 26bf62fbe7 设备状态采集工步 5 years ago
陈思洁 474bb995d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 608a1d1e51 ptl 5 years ago
汪云昊 41a39990f4 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 1eaacd1b28 Merge branch 'test' into dev 5 years ago
陈思洁 1a0000da40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 333ef54c80 Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev 5 years ago
钮海涛 2d5de4a29b Merge branch 'dev' of gragon.xu/i3plus-pojo into dev 5 years ago
puxiao.liao 8a7c5fa1b5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao e3b6f03dd8 北京麦格纳WMS#511【511 北京麦格纳-NC报废NC冻结-自动不良品标签打印】 
北京麦格纳WMS#510【510 北京麦格纳-拣货-领料任务监控看板】
北京麦格纳WMS#508【508 北京麦格纳-拣货-根据最短路径推荐条码】
北京麦格纳WMS#507【507 北京麦格纳-计划外入库（零星入库）新增，默认批次为生产日期】
北京麦格纳WMS#505【505 北京麦格纳-采购收货-推送收货差异邮件】
北京麦格纳WMS#509【509 北京麦格纳-过期品自动报警】
 5 years ago
puxiao.liao f5cd46f1f1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2da53135a8 bug7761【7761 发运配料界面，执行成功与无库存未做国际化，翻译资源已配置好】 
bug【7766 拆分打印功能操作完成后下方需要回显，拆分出的条码的零件号，条码，数量，库位。】
 5 years ago
王杰 7d743c2c7f Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
王杰 6cfc2c5501 ptl 5 years ago
陈思洁 b3e38170e6 【1440 PLC采集工步【生产数据】】 5 years ago
汪云昊 6293bf352d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao e90ea98d1f 解决冲突 5 years ago
luweihao 03f1c4fddf 修改生产数据结构 5 years ago
汪云昊 081db93d0d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
王杰 af4cb74392 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
王杰 8881bafecf ptl pcn 5 years ago
joke lin 3b928c6ddc [bug: 7637 生产数据] 5 years ago
汪云昊 b0a4eccca4 禁用启用，软删 5 years ago
joke lin e8f48bcb04 [bug: 7637 生产数据查询] 5 years ago
许心洁 313a0acfb8 test 5 years ago
王杰 b6a83fff5d Merge branch 'dev' into test 5 years ago
王杰 0b8c3317b8 ptlpcn enum 5 years ago
zcg 3d28840bae 【新增枚举，pojo】 5 years ago
zcg b28c092ade 【新增枚举】 5 years ago
王杰 9d23ec7720 Merge branch 'dev' into test 5 years ago
宋军超 8b9d8fd16d 添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体 5 years ago
许心洁 c214561f3b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 5b92cae5d1 3D仓库：联调优化+收货看板BUG#7308 5 years ago
puxiao.liao 9edfe18aec 【7565 收货分组功能要求。】bug7565 5 years ago
puxiao.liao 9ca00bee68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
luweihao d1d52ce389 Merge branch 'dev' into test 5 years ago
luweihao 8148b1654f 补上mes枚举 5 years ago
luweihao 16879a4f20 Merge branch 'dev' into test 5 years ago
陆卫豪 a65350bbf8 Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev 5 years ago
luweihao 12579c7a14 还原pom 5 years ago
luweihao b52bb02d73 task `1430` 工位扫描，产品信号监听，队列监听 5 years ago
zcg 416c2ceffc 【任务 1443 excel模板导入功能修改】 5 years ago
zcg 9388e3b4f2 【pojo 冲突提交】 5 years ago
puxiao.liao 0b1e812f7b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
luweihao 679319635a task `1430` 工位扫描，产品信号监听，队列监听 5 years ago
陈思洁 4fec84f810 【PTL_PLC配置表增加字段】 5 years ago
陆卫豪 60ab731ffd Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev 5 years ago
陆卫豪 d8d48bd913 Merge branch 'dev' of gragon.xu/i3plus-pojo into dev 5 years ago
joke lin d4e1e854c5 [任务：1441 plc推送数据] 5 years ago
joke lin 5ec9c55784 Merge remote-tracking branch 'pojo/dev' into dev 5 years ago
qianhs 65572b34a0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
王杰 999aae6fc0 解决冲突 5 years ago
王杰 78d7861b44 Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev 5 years ago
王杰 4b8cd0da38 ptlpcn enum 5 years ago
wei.peng 262edb9fec 日志查询优化, Es Tool 添加 聚合函数 5 years ago
puxiao.liao 8f584f250b 【7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件 
】bug7633
 5 years ago
puxiao.liao be479c2e76 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 46273325d3 动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675） 5 years ago
许心洁 8a98efa9a6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 eaed7962ab 动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+ 
3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）
 5 years ago
zcg bd82a0fba7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke lin 6b9b44995e Merge remote-tracking branch 'pojo/dev' into dev 5 years ago
曾贞一 38f1bd3b01 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 c0ce05e07c 【7648 在发运界面增加一个打开单据按钮】 5 years ago
曾贞一 2625c2cb0f 【修改 TSET-pom.xml】 5 years ago
puxiao.liao 4c0b2a1961 【 7603 单个零件标签打印功能修改。 
】bug7603
 5 years ago
joke lin 4823660070 [任务：1435 计划管理] 5 years ago
汪云昊 f2ccb20095 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 a3ecc3132f 表单约束管理 5 years ago
王杰 80ca438ce3 test合并到dev解决pom冲突 5 years ago
王杰 d9e4ea8ea9 Merge branch 'test' into dev 5 years ago
王杰 8ace0c363d ptl enum 5 years ago
宋军超 fd79008df6 ptl同步配置表添加是否区分工厂字段isIgnoreOrg 5 years ago
宋军超 d34f3b8215 2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中 5 years ago
钮海涛 669874cb9b Merge branch 'dev' into test 5 years ago
许心洁 368986e9d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 1d90195de6 3D仓库 5 years ago
曾贞一 5ebb5cbf20 【修改 TSET-pom.xml】 5 years ago
贾文涛 30722b130c Merge branch 'test' of i3-IMPP/i3plus-pojo into master 5 years ago
王杰 068a0956db 解决冲突 5 years ago
王杰 b77d3065a4 Merge branch 'test' into dev 5 years ago
曾贞一 0368152e71 Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev 5 years ago
曾贞一 4fcd7cbc3f Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
王杰 cd19bfb429 ptlpcn 5 years ago