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

5147 Commits (77d7ac18adab54ad92b17b9e1bf1689906371db8)

Author SHA1 Message Date
曾贞一 4fcd7cbc3f Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
王杰 cd19bfb429 ptlpcn 5 years ago
汪云昊 e0bfb4c660 Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev 5 years ago
汪云昊 a510196022 软删合同禁用启用功能 5 years ago
曾贞一 f16ac4a1d2 Merge branch 'dev' of gragon.xu/i3plus-pojo into dev 5 years ago
puxiao.liao 277d2c851c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke lin cb09776bdb [任务：1435 计划管理] 5 years ago
陈思洁 102af98a75 【PTL_增加主任务编号字段和组内编号字段】 5 years ago
宋军超 ac4a8b0ab4 修改ptl数据清除功能 5 years ago
许心洁 d815ca9b12 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 2c0ef55e85 解决动态查询BUG#7674,#7676+ 
流程导入BUG#7682
 5 years ago
陆卫豪 e43aee2e82 Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
王杰 01c5bb59e1 Merge branch 'dev' into test 5 years ago
宋军超 4d701aa9c4 添加ptl数据删除定时任务 5 years ago
宋军超 5b17289c4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao 61d3be19cb 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/WmsDocMovementSn.java
 5 years ago
puxiao.liao 0968cdc49e 【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601 
【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567
【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520
 5 years ago
zcg 5e78985247 【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突 5 years ago
zcg 7aecf9dcc0 【task 1436 工步-关键件绑定校验并转过程条码】 5 years ago
曾贞一 eefb472117 【7650 客户标签扫描】 5 years ago
曾贞一 a9c9915a4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5cc5844e45 【库存条码实体-添加字段 包装零件号】 5 years ago
joke lin ccf2817788 [计划管理] 5 years ago
汪云昊 dd991b44fc Merge remote-tracking branch 'origin/dev' into dev 5 years ago
许心洁 3d3f134d7f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 c9f6f336af 动态查询：解决了BUG#7658,7660,7661,7663,7664 
3D仓库：联调优化逻辑
 5 years ago
曾贞一 0acf2dc0ae Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 35c1114230 Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev 5 years ago
钮海涛 ca6e094271 Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
luweihao 196e5c87a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 00252caa0c 移动mespcn公用model 5 years ago
puxiao.liao 50d3de9b77 7600 二维码零件标签打印功能修改。 
7565 收货分组功能要求。
7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
7628 库存调整盘点时，扫描库位后的提示增加一个库位
7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示
7536 没库存时领料与发运的提示修改为下列
7659 创建盘点单冻结条码时条码is_vaild=2
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
7652 在条码状态报表中增加组号字段显示，查询框也需要增加
7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。
7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号
7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
 5 years ago
宋军超 380fded580 添加数据清理实体和死信数据定时任务 5 years ago
王杰 880d449dfb Merge branch 'dev' into test 5 years ago
王杰 b10ddbc958 ptl enum 5 years ago
luweihao 005db6ac5b Merge branch 'dev' into test 5 years ago
luweihao 4e70422bec Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 7beaa515c8 task `1428` 作业流程 5 years ago
joke 531596d2d4 [mes: 49 JIT计划与管理] 5 years ago
王杰 e0a018b871 Merge branch 'dev' into test 5 years ago
qianhs 027470cb07 1,重试 
2，流程优化
 5 years ago
陈思洁 fcb56e09e5 【PTL_控制器反馈信号逻辑修改】 5 years ago
王杰 03874359ac Merge branch 'dev' of adair.song/i3plus-pojo into dev 5 years ago
王杰 dd1e5778a9 ptl enum 5 years ago
宋军超 d156ffb85a 修改数据同步，添加死信数据界面 5 years ago
王杰 fa9c02705b ptl enum 5 years ago
王杰 269d325549 ptl 5 years ago
王杰 cd8dea1814 ptl 5 years ago
Administrator 797f3b3433 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 906576cb52 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 1e0d88fb0e 动态查询：开窗和时间查询优化+3D仓库基础数据校验优化 5 years ago
钮海涛 de73821fc7 Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into test 5 years ago
王杰 3fe76d1713 Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev 5 years ago
qianhs 0c85d7132b 1,回退代码 5 years ago
joke a7e8e1095d Merge remote-tracking branch 'i3plus-pojo/dev' into dev 5 years ago
joke aa403e9691 [ptl-pcn:39 校验物料号] 5 years ago
qianhs 1fc4ae1ff9 1,回退代码 5 years ago
qianhs d87f5653a9 1,任务呢管理 
2，生成任务
 5 years ago
王杰 68299bf421 Merge branch 'dev' of adair.song/i3plus-pojo into dev 5 years ago
宋军超 e15c2b6065 添加PTL数据同步功能 5 years ago
陈思洁 21c9af2007 【PTL_区段亮灯任务新增实体】 5 years ago
汪云昊 cb1e8d5310 任务检查校验优化 
lac适配异常处理优化
 5 years ago
王杰 1428b5f0aa ptl 5 years ago
luweihao 9f95e97ec3 Merge branch 'test' 5 years ago
luweihao 7c77c90a3c task 作业流程 5 years ago
曾贞一 9cc001fd17 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 fe72dc26d9 【 bug 7581 1.在同批次条码提示中增加一个库位。2.同批次按钮做全局变量属性'单库位'，'单人'，如果为'单库位'保持现在逻辑不变，如果为'单人'则显示当前用户责任区下所有同批次条码(不限制库位)】 5 years ago
luweihao dd6007656c Merge branch 'dev' into test 5 years ago
luweihao 23874d67e3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 4918707fc8 bug `7626` 开线管控-数据存入数据库错误 5 years ago
王杰 abb737f265 ptl 5 years ago
王杰 cde65d0e7a Merge branch 'dev' of gragon.xu/i3plus-pojo into dev 5 years ago
王杰 cfaa7c38bc Merge branch 'dev' of jessica.chen/i3plus-pojo into dev 5 years ago
王杰 37d032ca24 ptl反馈信息枚举 5 years ago
王杰 5610a25ab7 ptl反馈信息枚举 5 years ago
汪云昊 31a8a7705a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 0471038b9b sqlserver数据库适配 5 years ago
许心洁 df03827264 动态查询：注解enumName属性名称改为entityName 5 years ago
许心洁 a49b747c18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 cc98e84ba4 动态查询：增加开窗功能 5 years ago
陈思洁 83464294bb 【PTL_枚举引用修改】 5 years ago
宋军超 80d9852dd6 添加数据同步和定时任务功能 5 years ago
钮海涛 85dff1fde9 Merge remote-tracking branch 'origin/dev' into test 5 years ago
钮海涛 089a753be6 Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev 5 years ago
王杰 e1d133de61 ptl enum 5 years ago
qianhs 83ed87a769 【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】 5 years ago
曾贞一 145fcac065 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 767a9b98cd 【7568 PDA收货界面增加一个搜索框，让员工可以选择ASN单据收货】 5 years ago
王杰 8c334d2ffd 平台； 5 years ago
宋军超 96c5b35f83 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 0a0318d639 ptl 5 years ago
宋军超 51d666b5bc 开发PTL--PCN节点维护,同步配置和对象映射功能 5 years ago
luweihao f67dd06cd4 Merge branch 'dev' into test 5 years ago
luweihao 5a5854e0b6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 5892f87bdc task `1425` pcn pojo 迁移 5 years ago
王杰 34e76f59ce ptl 5 years ago
王杰 3a88bd7a78 ptl 5 years ago
王杰 51ca581f29 ptl 5 years ago
王杰 b64872fc53 ptl 5 years ago
puxiao.liao 05d0a0a375 【 1423 拣货-更新FIFO推荐组件、更新FIFO检查组件 
】拣货-更新FIFO推荐组件、更新FIFO检查组件
 5 years ago
王杰 644af42dfe ptl enum 5 years ago
王杰 7d13140a33 ptltag 5 years ago
joke ada46c9626 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke d871869f3a [ptl-pcn: 32 亮灯作业] 5 years ago
曾贞一 0a433f1ecf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 453226d6ec 【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码--修改按所有时间都可以查询出来】 5 years ago
陈思洁 0f9f3c31e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 1fd3cd3329 【PTL_增加主任务状态的枚举】 5 years ago
许心洁 309eea6f5d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 b8d7feb413 动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解 
+
字段无需区分工厂
 5 years ago
joke ccd62f8d31 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke d212b5cd30 [ptl-pcn: 32 亮灯作业] 5 years ago
luweihao 6263c56c1d Merge branch 'test' 5 years ago
luweihao 66f7121975 Merge branch 'dev' into test 5 years ago
陈思洁 d0cda06343 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 f8d4e7f1fd 【PTL_标签打印pojo新增】 5 years ago
许心洁 7e20104c52 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 377391abaf 修改导入导出进度明细。 5 years ago
许心洁 7ffb5d2c98 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 632ad62c45 动态查询：查询类名需作为动态入参 5 years ago
曾贞一 1aec8a2f5f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 a620828956 【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码】 5 years ago
宋军超 d056a04403 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 85f157c6a6 设置PTL_BOM中父物料描述默认值为1 5 years ago
陈思洁 720449cd09 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 faaf184e01 【PTL_增加主任务状态的枚举】 5 years ago
宋军超 2c06163f88 添加PTL_主任务明细实体 5 years ago
qianhs d3c30fa9be 【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】 5 years ago
luweihao b0d214f204 Merge branch 'test' 5 years ago
luweihao 51152656cc Merge branch 'dev' into test 5 years ago
luweihao a0a9e6b7b3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao e2d63434db bug `7570` `7561` 生产扣减代码去除测试代码 5 years ago
joke 3c408dd194 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke ab9e9a8638 解决冲突 5 years ago
王杰 35efadd243 ptl枚举 5 years ago
joke 6964d4cf4e [ptl-pcn: 32 亮灯作业] 5 years ago
陈思洁 686012563f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 40094365ce 【PTL_区段亮灯任务明细状态】 5 years ago
joke f362f9931f [ptl:32 亮灯作业] 5 years ago
joke c73cd26574 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke f01b3664c2 [ptl: 32 亮灯作业程序] 5 years ago
宋军超 464c8b68cc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 d56756e9e5 添加主任务、区域、区段枚举 5 years ago
陈思洁 e4ba6e21c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 cac0f91150 添加BOM中父物料描述默认值 5 years ago
陈思洁 728f46b43d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 2c305e0ca6 【修改枚举类名大写（部分）】 5 years ago
许心洁 2a09c009f3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 0fe0abff63 新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据 5 years ago
宋军超 896bd9b35b 添加基础数据枚举 5 years ago
宋军超 60ad38649d 新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据 5 years ago
luweihao 43a471d996 修改ptl项目pom 5 years ago
王杰 7662905caa Merge branch 'test' 5 years ago
王杰 b516ca254c 解决冲突 5 years ago
王杰 39a454f89b ptl 5 years ago
luweihao 1f4e7c5d45 Merge branch 'dev' into test 5 years ago
luweihao b556051295 task 修改监控类位置 5 years ago
luweihao 246dd85721 Merge branch 'dev' into test 5 years ago
陈思洁 658885ade5 合并冲突 5 years ago
陈思洁 1e431aef58 【1418 新增固化看板】 5 years ago
许心洁 55e3f212ce Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7f161e3bae 3D可视化仓库 5 years ago
jenkins 1ada447069 Jenkins自动合并 5 years ago
luweihao 1b727f1721 task 任务重试测试 5 years ago
luweihao 68cbd54f37 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 5fd51f6b1d task 任务重试测试 5 years ago
qianhs 91b43823c9 【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】 5 years ago
puxiao.liao 58fe5f61d8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 53a2152ff1 【 7531 在网页的条码打印界面增加一个按钮，可以修改部分条码数量，修改条件，库位为空，库区有值，条码状态为待入库。此部分条码为日生产计划生成的条码。 
】bug7531
 5 years ago
joke d42b7ebbb6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke 2b84f93950 任务: 1424 DT通信 5 years ago
jenkins b56d9cb824 Jenkins自动合并 5 years ago
陈思洁 970d8a3506 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 c40d3360d3 【1416 新增固化时间维护】 5 years ago
汪云昊 c4149a2d11 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
luweihao be2f1cb146 Merge branch 'dev' into test 5 years ago
luweihao 5eb7cf03ed task 数据同步添加错误信息字段 5 years ago
jenkins 9f0a0852e7 Jenkins自动合并 5 years ago
puxiao.liao 709db0b573 【 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。 
】bug7526
 5 years ago
jenkins 1ee4a53d64 Jenkins自动合并 5 years ago
puxiao.liao f2586f846a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 37ee72adaf 【 7523 条码拆箱功能输入数量时，此处提示改为“扫描成功，请输入新条码数量” 
】bug7523
 5 years ago
jenkins 9fc85191fe Jenkins自动合并 5 years ago
王杰 748ef11ccf ptl-pcn标签控制器枚举 5 years ago
puxiao.liao 759fda55b9 【 7527 1.推荐入库（推荐生产入库），如果扫描加密码错，报错有问题，2.如果扫描库位时，检查条码某项条件不符合入库规范则需要回到请扫描条码那一步。 
】bug7527
 5 years ago
luweihao 03a139e435 Merge branch 'dev' into test 5 years ago
luweihao e38839db6c task `1408` 数据同步修改 5 years ago
jenkins 499a5ed894 Jenkins自动合并 5 years ago
luweihao 846001c7a9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 1a2f00afc3 task `1408` 添加数据同步存储 5 years ago
luweihao 1ec56edcdc task `1295` mes添加索引 5 years ago
汪云昊 f7d6192794 资源唯一校验调整为key+languageCode+softType 5 years ago
jenkins ec0b3528f4 Jenkins自动合并 5 years ago
qianhs 243c38793b 【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】 5 years ago
jenkins 1e2029fbbb Jenkins自动合并 5 years ago
luweihao 0d212df73a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao b6477202e7 新增枚举调用类 5 years ago
jenkins 83a9b74c43 Jenkins自动合并 5 years ago
汪云昊 6d1d41a4a7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
jenkins 7decc606cb Jenkins自动合并 5 years ago