1917 Commits (4013ed776b53bcbb154e64bfea23bc75689382fb)

Author SHA1 Message Date
puxiao.liao 1d66ce2612 【VDA推荐入库-入库成功-无引导信息】bug6645 6 years ago
jenkins c8b0c49b57 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
wei.peng 6d5fc7ab39 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 e5767574fe 任务明细POJO添加交易类型代码字段:唯一索引 6 years ago
王杰 73b1e827d6 Merge branch 'dev' into test 6 years ago
gcj 87dd679d47 【采购收货】 6 years ago
许心洁 e37653c544 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 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
jenkins 5947429d54 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
于学杰 8d15084b20 1. 调整5个批次的名称 6 years ago
jenkins 68b650ab81 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
1111 8447ef39c9 【采购收货】 6 years ago
jenkins 870dc7007d Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
1111 acbbbf8e32 【采购收货】 6 years ago
jenkins f6506bdd0b Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
曾贞一 47ccfcc9e3 【EU成品发运-检查数量组件】【bug1177】
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
6 years ago
jenkins 2f6400dc78 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
1111 7452d49930 【采购收货】 6 years ago
jenkins ddee8a5215 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
qianhs 314aa78336 【 采购日程单里的寄售属性选项是0/1,应改为是/否】【bug6369】 6 years ago
crish 4d3adf5daf Merge branch 'dev' into test 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
jenkins 04ae04246e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
jenkins edc281dffe Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
qinjia zou 51d70654ef 【欧洲-生产快速入库】bug6389 6 years ago
王杰 ac5432bebb 解决冲突 6 years ago
jenkins 8eb8c2f97e Merge branch 'master' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 9f9c095846 Merge branch 'dev' into test 6 years ago
1111 d35c6e97cd 【采购收货】 6 years ago
王杰 a595fed4fe Merge branch 'test' 6 years ago
jenkins e7bad502c3 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
1111 96ea008725 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 c0d8375d0f Merge remote-tracking branch 'remotes/origin/dev' into test 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
汪云昊 68f31721f0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
qianhs d4422bee15 【 PO订单页面,点击查询后,过滤条件错误,导致数据显示异常】【bug6493】 6 years ago
王杰 7f08847c50 Merge branch 'test' 6 years ago
王杰 6297ccc4d7 Merge branch 'dev' into test 6 years ago
陈思洁 5050c0c5a1 新增实体--安全库存 6 years ago
qinjia zou 2210482918 【自动入库】bug6390 6 years ago
wei.peng 02a9c64a42 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
qinjia zou a8ebcb669b 【自动入库】bug6390 6 years ago
qinjia zou 6e8977e5aa 【自动入库】bug6390 6 years ago
陆卫豪 4a76c480ac Merge branch 'test' of i3-IMPP/i3plus-pojo into master 6 years ago
jenkins f76aaddbd5 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
qianhs a55795d43f 【 VDA收货---预收货的单据,要在页面上可以查询】【bug6465】 6 years ago
qianhs f0b35d1d74 【VDA生产退料-条码所在库位-需为线边库位】【bug6442】
【VDA收货---选择ASN订单,点击预收货,预收货成功后,按钮还可以点击。导致数据重复】【bug6464】
【	VDA收货---预收货的单据,要在页面上可以查询】【bug6465】
6 years ago
jenkins 4d2a2a35b0 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
王杰 1a7164c474 Merge branch 'dev' into test 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
王杰 57253ea87b Merge branch 'dev' into test 6 years ago
puxiao.liao a441633326 【超级移库】bug6295 6 years ago
crish 5b6b303722 Merge branch 'test' 6 years ago
crish 17d5f1e512 Merge branch 'dev' into test 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
曾贞一 7dbb55bcb0 【VDA质检】【缺了检验条码数量是否为-bug6402】 6 years ago
jenkins b5685a7874 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 c27daae8e4 移动单条码表 --供应商编码 6 years ago
王杰 9137555226 Merge branch 'dev' into test 6 years ago
puxiao.liao 21375ed6f4 【超级移库】bug6295 6 years ago
jenkins c1b50db526 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
许心洁 60c25d7a71 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 ccb29c5903 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
1111 2f2c843006 【坤泰-采购收货】包装关系 6 years ago
许心洁 208410340e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
王杰 ab34ebb769 Merge branch 'dev' into test 6 years ago
qianhs 62bb71f4b0 【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】 6 years ago
许心洁 6d9787dc65 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lpx 94dc90172d 【扫描查询】bug6246 6 years ago
张哲铭 578be0650a Merge branch 'dev' into test 6 years ago
1111 7378df1b9e 【宁德问题清单】 6 years ago
张哲铭 6871e96496 Merge branch 'dev' into test 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
crish c4d7a2380c Merge branch 'test' 6 years ago
张哲铭 efbe0dfce9 Merge remote-tracking branch 'origin/dev' into test 6 years ago
lpx fc49ddeea5 【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】 6 years ago
许心洁 e433915759 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
曾贞一 be75c4ec42 【VDA质检--物料信息维护】任务号1135
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
6 years ago
许心洁 017cd18950 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 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
王杰 d2c7a81893 Merge branch 'dev' into test 6 years ago
陈思洁 3ef115bbe2 新增冗余字段 6 years ago
许心洁 219bf6db9a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
qianhs 457e10bc75 1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】 6 years ago
许心洁 04453aa706 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 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
王杰 2417b40635 Merge branch 'dev' into test 6 years ago
于学杰 80c340308a 1. 修改通用接口POJO中的字段长度 6 years ago
许心洁 c9f26c22c1 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 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
王杰 9446a76159 Merge branch 'dev' into test 6 years ago
曾贞一 1357dfad30 【VDA收货-- 前端PC端POsn页】任务号1102
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 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
crish 88af19f8e9 修改开发环境pom文件test为dev 6 years ago
changjiang.gao 13066bd4d1 【库存预警】bug 243 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
许心洁 3bc277178e Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 a90aa8498f 实体修改字段类型【int】改成【Integer】 6 years ago
许心洁 0c20a2b655 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 e5b5891d23 bom信息中新增冗余字符 6 years ago
许心洁 f5a8e9f130 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 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
许心洁 77fefbcf74 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 04df70114d Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 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
crish 15e812c7a6 Merge branch 'test' 6 years ago
许心洁 02055a8b7e Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 18789939b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 0526da8ee3 Merge branch 'test' 6 years ago
crish cd74f5336f Merge branch 'dev' into test 6 years ago
于学杰 dbc69e957a 1. 供应商物料实体增加字段 6 years ago
刘辉 e89df89f9a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
changjiang.gao 3ab8cf112d 盘点条码差异 6 years ago
刘辉 febbea09c3 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
刘辉 4ffc63ce83 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
bleakney.liu f6be80db01 增加groupby 构造函数 6 years ago
许心洁 a1597c089c 成品冲销+导入转换格式(就一个不知道是什么单导入) 6 years ago
crish 1de89d732b 本地误拉了test代码,解决pom 6 years ago
crish 9f9874902d 冲突解决 6 years ago
曾贞一 e603ac66a7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 16839f6911 成品冲销+抛异常方法封装优化 6 years ago
许心洁 2f843a8f5a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 88754f9a71 收货看板重写 6 years ago
于学杰 68a6c85068 Merge branch 'dev' into test 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
wei.peng e7e4a8587f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
于学杰 fcefe8de38 1. 通用接口增加调用软适配的功能(使用脚本引擎实现) 6 years ago
许心洁 7863325afd 本地误拉了测试的代码,还原后提交,在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码:还原 6 years ago
刘辉 83a7a9e988 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
changjiang.gao 9e1b86eb2b 导出显示bug修改 6 years ago
许心洁 8deff73454 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
changjiang.gao 647508d92c 导出显示bug修改 6 years ago
刘辉 722146acd8 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
许心洁 6fc4474699 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub a4d873f36f 添加过滤条件 6 years ago
crish 672438f2c0 Merge branch 'test' 6 years ago
许心洁 04cdf58aef Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub abd2321850 格式化代码 6 years ago
crish 0924810e64 Merge branch 'test' 6 years ago
许心洁 89ab1816e3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
lbwgithub 71a68e8cf6 枚举 6 years ago
王杰 18bc35f60d Merge branch 'dev' into test 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
刘辉 60d1798b9c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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