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

1951 Commits (b43317c11a683658d5a7cfec8a7458260d9c6e98)

Author SHA1 Message Date
曾贞一 328f2e64c5 【同批次修改】 5 years ago
qianhs 2eb14492d4 【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】 5 years ago
E c7a2c79f26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 ff4cd68e89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 c2e66de638 Wms动态搜索与自定义列表，表单开发 5 years ago
袁津哲 86694d3ceb Wms动态搜索与自定义列表，表单开发 5 years ago
gcj 8245950fd3 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
gcj 51c66e9279 【宁德问题清单】 5 years ago
陈思洁 1e0a0ff4fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 c24de431d4 【6853 数据迁移：产品报工明细表、产品发运表、产品入库表。定期迁移。】 5 years ago
曾贞一 c3ad3d260a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 3d7f88d2ee 【7201 收货BOP移库流程图】 5 years ago
gcj 8414af2011 【按规则推送邮件】 5 years ago
gcj 890b094e15 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 7090f30b94 【按规则推送邮件】 5 years ago
qianhs 241350ae83 【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】 5 years ago
E 0cc70fe2d0 【#1390 基础数据-客户信息增加导入功能】 5 years ago
袁津哲 fc19275ef0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 4e0f40042a Wms动态搜索与自定义列表，表单开发 5 years ago
陈思洁 b0065bd650 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 fa576d7a6d 【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】 5 years ago
袁津哲 42bbb852c4 Wms初始化扫描实体字段新增逻辑优化 5 years ago
袁津哲 2f2f24356c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 daf3365ce3 Wms初始化扫描实体字段新增逻辑优化 5 years ago
gcj cbe87c6bd7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj c14d6c6916 【宁德问题清单】 5 years ago
袁津哲 e5138ac4e9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e1386275d0 Wms初始化扫描实体字段新增逻辑优化 5 years ago
陈思洁 99f79ee5db Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 25606ea25a 【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】 5 years ago
袁津哲 29f785ed35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 7d4ba10449 Wms初始化扫描实体字段新增逻辑优化 5 years ago
许心洁 2f90982e68 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 c53c8c04e3 BUG#7186 5 years ago
宋军超 b0f60a9176 2020-01-08创建动态列表与查询model 5 years ago
e-jiawentao1 7b696d7e73 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
e-jiawentao1 a92090a3ab 2020-01-07创建动态查询与表单各层 5 years ago
e-jiawentao1 c51453a856 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
e-jiawentao1 9fbc120666 动态搜索与自定义列表初始化扫描Bean字段 5 years ago
e-jiawentao1 b2edab4ef4 2020-01-07创建动态查询与表单dao 5 years ago
e-jiawentao1 1dba90f768 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
e-jiawentao1 b939ce6625 2020-01-07创建动态查询实体 5 years ago
许心洁 7d63a933c0 生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑 5 years ago
许心洁 267ec6c647 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 fe809e2eff 定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错 5 years ago
曾贞一 989e05c64c 【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】 5 years ago
曾贞一 9e9d3e2afa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5a4510cedb 【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】 5 years ago
陈思洁 bae2130d72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 1f1f6ec825 【KT-1346 增加拉动任务的暂停和开启】 5 years ago
puxiao.liao 0d2df2ec43 【 7194 Po明细导出，单据状态为中文 
】bug7194
 5 years ago
puxiao.liao a3a5e63baa 【 7194 Po明细导出，单据状态为中文 
】bug7194
 5 years ago
许心洁 861f46323b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7594b3d515 SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消 5 years ago
E a1276b5542 【#1338 库位物料中需要增加批量导入】 5 years ago
许心洁 a231651315 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj b29347c409 【坤泰运输管理】 5 years ago
许心洁 9a272f8b6a BUG#6755：移动单监听队列新增逻辑：如果当前处理的移动单的交易类型配置成需要推送异常邮件，并且全局参数“系统管理员”也有配置，则随送异常邮件 5 years ago
陈思洁 05efdbb568 【KT-1339 安全库存拉动，新增低于起订量概念】 5 years ago
陈思洁 1e1e5e907e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 472adfd03c 【KT-1339 安全库存拉动，新增低于起订量概念】 5 years ago
puxiao.liao f8e3edabc3 【 7159 线边退料逻辑错误，应该为：扫描A条码，输入原条码的剩余数量，拆包生成的新条码留在线边，原条码退回仓库。若数量与原条码相等，则不做拆包。 
】bug7159
 5 years ago
曾贞一 2da366630f 【VDA波次配料--物料汇总优化】 5 years ago
曾贞一 ed25a6f7d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 46bf93f410 【VDA波次配料--物料汇总优化】 5 years ago
gcj 5c838ebcf1 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
gcj 62c50e04cc 【宁德问题清单】 5 years ago
E b175de4635 【#1335 基础数据-包装规格管理-增加导入导出】"默认容器类型"改为"容器类型" 5 years ago
E e962a1d22a 【#1331 KT-基础数据-物料信息】“标准包装”改为“标包” 5 years ago
许心洁 d5efd000b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 d94ccd5ac5 下线扣减交易处理组件BUG：获取双精度类型数值时应该判断是否为空getHandledQtyVal 5 years ago
E 9e47c4ac5a 【#1332 基础数据-容器类型管理】新增期限单位字段 5 years ago
许心洁 018908d3cb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 032bd61b87 物料拆分新增等份拆分功能+ 
快速移库写入移动单明细的行号写入规则不对，优化性能+
下线扣减交易处理组件修改逻辑：有条码就扣减，移动单明细表新增已处理数量，处理完毕才更新移动单的状态为已处理并传给MOVE_TO_ERP处理程序+
实时库存明细报表新增列“处理中数量”（待过账的数量）
 5 years ago
puxiao.liao d34ba5e114 【 经讨论六合一允许扫描来源或目标不同的零件号，但是提交时需要按照目标来源拆分成不同的单据 
】bug7068
 5 years ago
qianhs 7f69df95df 【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】 5 years ago
曾贞一 0493feaf80 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 1f8885779f 【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】 5 years ago
陈思洁 9d5eac441e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 b5d50af250 【KT-1284 计划拉动-生产计划管理】 5 years ago
曾贞一 6eafdb1d7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5ea55135dc 【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】 5 years ago
gcj c199b977e5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj cfa465817f 【修改模糊查询】 5 years ago
qianhs 34e4d837af 【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】 5 years ago
gcj 7e41cde458 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 894dbed46c 【宁德问题清单】 5 years ago
曾贞一 4bd0aa8d57 【系统配置-模糊查询 】 5 years ago
gcj 9c2dcba09d 【运输管理】添加查询关联单号 5 years ago
曾贞一 91716272a6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 393d3f12b8 【7055 新增波次拣货流程】 5 years ago
陈思洁 03982ad2e0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 03eeacd273 【KT-1298 物流路线【处理模式】优化】 5 years ago
qianhs 1d7cf41653 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】后期待优化 5 years ago
qianhs 4c8a94bdfa 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 5 years ago
qianhs a2ac02aa47 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 5 years ago
E 69e20029e8 【1320 KT物料信息--需要维护物料的类型：器具】增加描述：90=器具库 5 years ago
许心洁 eb084d3904 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 0d7e64b160 在调用交易处理组件之前把交易处理组件类型名称一并赋值到MOVEMASTER对象中，省去每个组件中再去循环查询。 5 years ago
qianhs 5c28c8344c 【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】 5 years ago
gcj b29d84bbad 【运输管理】 5 years ago
gcj ba355aab55 【运输管理】 5 years ago
gcj 01e5919349 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 4f1455012f 【领料上线扫描时，在扫描完条码后将目标库位带出。 
】bug7024
 5 years ago
gcj 0e1599789d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj d92850c1a4 【运输管理】 5 years ago
puxiao.liao 0c01ffb230 【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 
】6978
 5 years ago
陈思洁 d0ddf208c3 【KT-1297 物流路线的【适用范围】优化】 5 years ago
qianhs d4d30bf634 【 零件号条码打印，扫描后需要提示当前扫描零件，当前扫描数量，剩余扫描数量（标包减去扫描数量）。】【bug7020】 5 years ago
陈思洁 5d4e8a94c4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 c5ae91b41e 【KT-1286 计划拉动-计划拉动JOB】 5 years ago
许心洁 258c1ccbe8 流程导入：优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库：只能移入库状态的条码；不可多人操作同一个库位进行整库移库 5 years ago
gcj 4c2d922ed9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 2c63820f98 【运输管理】 5 years ago
puxiao.liao da4f32f0b4 【在配料时，点击右上角放大镜，输入单号无法查询，并且显示的内容需要有来源，目标，是否紧急 
】6978
 5 years ago
gcj 59e7704f67 【运输管理】装车单 5 years ago
陈思洁 40c64db0b1 冲突 5 years ago
陈思洁 ee14ce1d4b 【KT-快速入库功能】 5 years ago
puxiao.liao 99a1ec309d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao 3bfb0995d5 【物料基础信息增加【贵重物料】属性，领料上线流程根据此属性判断是否需要扫描目标库位 
】bug1299
 5 years ago
gcj 304677e7da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 91e3209ef9 【运输管理】 5 years ago
许心洁 5a1dc6dc7d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 67f7d66782 宁德现场问题#330 6 years ago
E ef9293867f 【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】 6 years ago
许心洁 927579aca5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 fc663ee283 作业流程导入导出BUG#6189 6 years ago
陈思洁 45c1fc6571 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 129e60a6df 【KT-1284 计划拉动-生产计划管理】 6 years ago
gcj a6bb80a5a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj 2e98e17a05 【运输管理】 6 years ago
qianhs da2cfd77b0 【 增加一个扫描零件上的条码，累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】 6 years ago
陈思洁 7d07580a78 合并冲突 6 years ago
陈思洁 b9844c255b 生产计划表结构增加 6 years ago
gcj 3e6ca8d039 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj a1a3d1e838 【Bug清单】------------------------------ 6 years ago
于学杰 67b5069c48 1. 增加分组提交的配置字段 6 years ago
陈思洁 3a353b1539 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 1d5f4b38a4 【KT-1282 计划拉动-班次管理】 6 years ago
gcj 32dccc056c 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/sqlpack/WmsHqlPack.java
 6 years ago
gcj 1e10bdee0c 【坤泰运输管理】 6 years ago
陈思洁 eb5f9610a8 【KT-1282 计划拉动-班次管理】 6 years ago
陈思洁 5797ec4b1b 新增工位表字段 6 years ago
陈思洁 4f67cc1310 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 61f3465255 新增工位表字段 6 years ago
许心洁 49a126843b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 2ce2f17353 流程管家：新增“是否连带提交创建状态移动单”属性；新增重置功能+生产扣减交易处理组件+交易处理成功程序+ESB解析程序多余异常输出去除+质检流程加上是否允许多人操作校验+PDA动态菜单交易类型描述国际化 6 years ago
曾贞一 594d6a4135 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
puxiao.liao e580dcbd2d 【扫描查询查询一个条码的时候要分行显示该条吗的：库存地，库位，条码，状态，数量，零件号，供应商批次，过期日期，收获批次，需要分行显示】bug6663 6 years ago
曾贞一 892d63b9b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj b6ae28c957 【采购收货】 6 years ago
许心洁 e4348cd334 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 fa8a88c6d0 流程管家：提交后如果流程第一个步骤的提示方法包含回显值则叠加在提交提示消息后+给基类BaseBean的isdeleted,isvalid加上默认值，给两个实体加默认值试试水+WmsCsDetailsModel类位置严重不符合规范，已移至Pojo-Model项目中 6 years ago
gcj 1d0c03ba9c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
E 831daa4964 【#1241 KT-收货看板-增加道口】 6 years ago
gcj a35171a41d 【采购收货】 6 years ago
曾贞一 bb92161133 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
qianhs c8f23ba640 【 库存报表中无法看到寄售零件】【bug6331】 6 years ago
puxiao.liao 91ec41b3c0 暂时注解掉索引信息。 6 years ago
曾贞一 793535e74c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 8892c78692 【EU成品发运-客户编号】 6 years ago
puxiao.liao 7df617b290 【质检单查询界面需要支持按照ASN和零件号查询，显示出的明细中质中要显示物料信息】bug6651 6 years ago
陈思洁 42d1a461a4 新增附件信息表 6 years ago
陈思洁 9cb03c8661 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 c6ff8f109c 新增附件信息表 6 years ago
puxiao.liao 1d66ce2612 【VDA推荐入库-入库成功-无引导信息】bug6645 6 years ago
陈思洁 544944d31c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 d0e6d30a9e #6639 【VDA生产领料-FIFO跳过-系统异常】 6 years ago
gcj e827462426 【采购收货】 6 years ago
许心洁 e5767574fe 任务明细POJO添加交易类型代码字段：唯一索引 6 years ago
gcj 87dd679d47 【采购收货】 6 years ago
许心洁 214b3a07b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 f39e16511f 给所有JOB加上了redis锁+IOT解析优化+系统配置POJO参数值的类型改为长整形，否则新增时参数值过长会系统异常 6 years ago
于学杰 8d15084b20 1. 调整5个批次的名称 6 years ago
1111 8447ef39c9 【采购收货】 6 years ago
1111 acbbbf8e32 【采购收货】 6 years ago
曾贞一 47ccfcc9e3 【EU成品发运-检查数量组件】【bug1177】 
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
 6 years ago
1111 7452d49930 【采购收货】 6 years ago
qianhs 314aa78336 【 采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】 6 years ago
1111 f0290a758d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
1111 e349ab3e9b 【采购收货】 6 years ago
qinjia zou c051b6024b 【VDA物流路线-路线新增-字段赋值】bug6515 6 years ago
许心洁 549f63aa0d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 07bda76d4f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 b181cf2ac3 【安全库存拉动】 6 years ago
许心洁 77b921ef38 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b0c4d11000 流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304） 6 years ago
qinjia zou 51d70654ef 【欧洲-生产快速入库】bug6389 6 years ago
1111 d35c6e97cd 【采购收货】 6 years ago
1111 96ea008725 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 41a48b4b59 【采购收货】 采购收货 6 years ago
许心洁 8d6a2b53b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b7c6189308 生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%） 6 years ago
qianhs d4422bee15 【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】 6 years ago
陈思洁 5050c0c5a1 新增实体--安全库存 6 years ago
qinjia zou 2210482918 【自动入库】bug6390 6 years ago
qinjia zou a8ebcb669b 【自动入库】bug6390 6 years ago
qinjia zou 6e8977e5aa 【自动入库】bug6390 6 years ago
qianhs a55795d43f 【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】 6 years ago
qianhs f0b35d1d74 【VDA生产退料-条码所在库位-需为线边库位】【bug6442】 
【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】
【	VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
 6 years ago
许心洁 339a12eba3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 3781713a29 实时库存-条码明细优化查询速度 6 years ago
于学杰 9e625acc0d 1. MOVE_TO_ERP 增加是否预收货字段 6 years ago
曾贞一 3ba4e9b4f1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 28078287af 【VDA收货】【预收货的单据，要在页面上可以查询-bug6465】 6 years ago
于学杰 71818c4745 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 db9a698c68 1. 增加是否寄售的属性 6 years ago
qianhs 48cbf9d471 【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】 
【	库存报表中无法看到寄售零件】【bug6331】
 6 years ago
puxiao.liao 3bda3169f4 【超级移库】bug6295 6 years ago
puxiao.liao a441633326 【超级移库】bug6295 6 years ago
曾贞一 7dbb55bcb0 【VDA质检】【缺了检验条码数量是否为-bug6402】 6 years ago
陈思洁 c27daae8e4 移动单条码表 --供应商编码 6 years ago
puxiao.liao 21375ed6f4 【超级移库】bug6295 6 years ago
puxiao.liao 1f85c75f6c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
puxiao.liao 9b8d4c900b 【事物查询】bug6294 6 years ago
1111 2077c651e7 【采购收货】 6 years ago
1111 2f2c843006 【坤泰-采购收货】包装关系 6 years ago
qianhs 62bb71f4b0 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
lpx 94dc90172d 【扫描查询】bug6246 6 years ago
1111 7378df1b9e 【宁德问题清单】 6 years ago
1111 88a69ac7f8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
1111 71c867dd8c 【包装规格】 6 years ago
许心洁 ac43296df3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5dc8ffb394 日志处理队列V1.0 6 years ago
lpx fc49ddeea5 【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】 6 years ago
曾贞一 be75c4ec42 【VDA质检--物料信息维护】任务号1135 
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
 6 years ago
曾贞一 d428aa302d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 b7071bd0db 供应商字段 添加 6 years ago
陈思洁 3ef115bbe2 新增冗余字段 6 years ago
qianhs 457e10bc75 1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】 6 years ago
gaochangjiang d0165fd342 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
陈思洁 2414993cf9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 777060450e 新增字段--目标库位 6 years ago
gaochangjiang 047b9d5e35 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gaochangjiang 02e3ac4960 【库存预警】bug 修复库存预警 6 years ago
于学杰 80c340308a 1. 修改通用接口POJO中的字段长度 6 years ago
许心洁 bbec6a1002 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b112bdb5e8 成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除 6 years ago
曾贞一 1357dfad30 【VDA收货-- 前端PC端POsn页】任务号1102 
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
 6 years ago
许心洁 dd86ce354a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b8842edbb1 无条码打印：新功能开发完成 6 years ago
changjiang.gao 13066bd4d1 【库存预警】bug 243 6 years ago
陈思洁 a90aa8498f 实体修改字段类型【int】改成【Integer】 6 years ago
陈思洁 e5b5891d23 bom信息中新增冗余字符 6 years ago
曾贞一 610a96d2ee Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 6b9c7b3ced 【VDA库存调整盘点】 添加供应商字段 6 years ago
许心洁 e593cc875d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
changjiang.gao 2ba7596a57 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
changjiang.gao 25f11781c1 盘点差异增加字段 6 years ago
许心洁 ba7fe81978 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5956d5a08e 冲销：需求变更优化 6 years ago
曾贞一 26b4a5c52c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 a9045ed403 bug 5953 6 years ago
陈思洁 a54d711d95 #1085 BOM导入接口新增 6 years ago
许心洁 18789939b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 dbc69e957a 1. 供应商物料实体增加字段 6 years ago
changjiang.gao 3ab8cf112d 盘点条码差异 6 years ago
changjiang.gao 8808a77de6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
changjiang.gao 69e8357c69 条码数量编辑 6 years ago
于学杰 63e225026c 1. 扩展通用接口功能，支持与软适配的对接 6 years ago
bleakney.liu f6be80db01 增加groupby 构造函数 6 years ago
许心洁 a1597c089c 成品冲销+导入转换格式（就一个不知道是什么单导入） 6 years ago
许心洁 16839f6911 成品冲销+抛异常方法封装优化 6 years ago
许心洁 88754f9a71 收货看板重写 6 years ago
陈思洁 cd8bd3a68b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 3828b4863c 添加保质期字段 6 years ago
曾贞一 dfdb6be4bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 6a9924eda6 【VDA生产领料】 FIFO推荐组件 6 years ago
于学杰 fcefe8de38 1. 通用接口增加调用软适配的功能（使用脚本引擎实现） 6 years ago
changjiang.gao 9e1b86eb2b 导出显示bug修改 6 years ago
changjiang.gao 647508d92c 导出显示bug修改 6 years ago
bleakney.liu 29fee6b028 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
bleakney.liu 746a04f96d 代码格式优化 6 years ago
lbwgithub a4d873f36f 添加过滤条件 6 years ago
lbwgithub abd2321850 格式化代码 6 years ago
lbwgithub 71a68e8cf6 枚举 6 years ago
lbwgithub 473e2caea0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
lbwgithub 2cf4759c21 枚举 6 years ago
陈思洁 0bdc3592e2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 f67e7df17f 新增冗余字段 6 years ago
曾贞一 320c7f6b1f 【生产快速入库】生产快速入库导入接口 6 years ago
曾贞一 9d3b45d2e2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ddd91f51b5 【生产快速入库】组件选择，任务编号1051 6 years ago
许心洁 84a96a22fa 新加NotNumBiggerPackContainsZero方法 6 years ago
许心洁 95f156adf4 所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double 6 years ago
许心洁 1a7b4e3438 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 113bb8755d 解决冲突 6 years ago
陈思洁 4ac7bae38b 新增hql 6 years ago
bleakney.liu 0fa1ffa23b [物流线路修改]修改数据类型 6 years ago
bleakney.liu f682d056be [物流线路管理]修改查询条件 6 years ago
许心洁 653c8dca1f 直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误 6 years ago
曾贞一 2b62357ab5 VDA收货【生产快速入库】组件，任务编号1051 6 years ago
许心洁 e90c59ccf2 生产报工当查询到多条子物料时查询的SQL没有返回itemQty 6 years ago
lbwgithub 4fc72ca358 条码模型 6 years ago
lbwgithub 81d86d1bd2 条码模型 6 years ago
曾贞一 c509f3c707 VDA 生产快速入库 6 years ago
陈思洁 26684524f1 生产报工组件和生产报工标签组件提交 6 years ago
陈思洁 3ba6508b0c 新增打印机配置表 6 years ago
陈思洁 22fbbe2a91 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 edfc78995b 新增打印机配置表 6 years ago
刘敏 8a94b054d8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 c2a75d96da 实体字段get方法修改 6 years ago
许心洁 f1f712c997 流程管家关联查询流程明细BUG：导致流程错乱 6 years ago
许心洁 dcf326366e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 8f7d3b371b 流程管家：回显给前端当前步骤参数类型 6 years ago
刘敏 e42cd80b8b 条码打印枚举添加待退料状态 6 years ago
刘敏 bc1dea29ad po、asn查询条件添加 6 years ago
刘敏 522efe67b6 excel导出优化--单据状态显示枚举描述 6 years ago
刘敏 0f82f3fbe5 导出状态添加 6 years ago
许心洁 e5591eafc5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 e02f2bfeee 单据条码实体临时字段增加 6 years ago
许心洁 ec3ef597e8 根据工厂代码调整库存 6 years ago
刘敏 ed29263655 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 adf699f618 移动单表是否快照临时字段新增 6 years ago
bleakney.liu 53dd9cface add 物流路线pojo 6 years ago
刘敏 f6e9dd03b4 库存快照job开发【任务1011】 6 years ago
刘敏 4e46760fb6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 f57dd8e999 库存信息表、库存条码、移动单三张表快照时间新增 6 years ago
于学杰 c974cf1450 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 d273159e3e 1. 增加目的质量状态（规则表） 6 years ago
曾贞一 cb5eb56fe4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 5d1e6e8474 VDA收货 库位推荐入库规则 6 years ago
刘敏 baf39dc0ce 生产退料导入实体新增 6 years ago
刘敏 809478be44 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 d8bc8d713d 条码打印model字段添加 6 years ago
bleakney.liu 2c146d39bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
bleakney.liu e52c310d38 add 入库pojo 和response 6 years ago
曾贞一 9e2169fa87 推荐入库 组件开发 6 years ago
曾贞一 512ebb495c VDA收货 提交组件 6 years ago
曾贞一 f17c1d3d25 推荐入库 组件开发 6 years ago
许心洁 787f12387d 流程管家：关联单据类型为盘点时不需要查询其它移动单+移动单的业务类型为质检时查询关联移动单的逻辑特殊处理 6 years ago
许心洁 de6792426e 流程管家：单据完成提交所有待提交移动单；只推送当前移动单 
PDA收货组件：改数后删除历史记录BUG修复
 6 years ago
曾贞一 d509e5755a vda 收货超收处理 6 years ago
曾贞一 c5f43236a3 开口合同与po关系 6 years ago
于学杰 05dc432c57 1. 增加关联单位和关联数量字段 6 years ago
刘敏 72fec8146d 修改 6 years ago
刘敏 5b6477bba6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 510485d2f0 excel导出优化--单据状态显示枚举描述 6 years ago
许心洁 59569cef66 移动单主表去掉乐观锁（处理错误移动单JOB一个事务内对一个表进行了两次操作不行，导致程序直接挂掉，事务也没回滚）+ 
交易处理组件（出入移库）：待入库的可能是不合格的+
公共PDA组件抛异常获取值为空
 6 years ago
陈思洁 02270ea6e8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 f5d2398e0e VDA收货--开口合同增加字段 
供应商增加字段
 6 years ago
于学杰 01c58e8653 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 3454712bd2 1. 增加库存快照的类文件 6 years ago
刘敏 5b7ac2c344 ASN字段修改 6 years ago
刘敏 c7734b7e26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 5144d15ac4 采购单报表开发 6 years ago
许心洁 03ef38f853 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 315787197a 交易处理组件（收货）：免检写入收货事务取目的库位的值+乐观锁去掉临时属性 6 years ago
曾贞一 b5dfa7dbd2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 8d6e4fdfa5 盘点实盘导入功能 6 years ago