4559 Commits (32d715a29cb5828bc634fd1eead3f5b2ea6245ec)

Author SHA1 Message Date
王杰 42a22d14d3 安灯导出字=字段冗余 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
WYnneaoapc cb7a1dea2a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 011b4d2205 zh20200101 现场问题修改 BI all 5 years ago
gcj b29347c409 【坤泰运输管理】 5 years ago
钮海涛 9627b6cf9e 修改资源甘特图侧边栏显示内容 5 years ago
钮海涛 2eb244c41c 修改资源甘特图侧边栏显示内容 5 years ago
许心洁 9a272f8b6a BUG#6755:移动单监听队列新增逻辑:如果当前处理的移动单的交易类型配置成需要推送异常邮件,并且全局参数“系统管理员”也有配置,则随送异常邮件 5 years ago
汪云昊 1cc4cacb5f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 b0b671aac0 软适配 数据源适配器优化 5 years ago
陈思洁 9f0a1e8ce0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 05efdbb568 【KT-1339 安全库存拉动,新增低于起订量概念】 5 years ago
王杰 8a4aa9fed2 jis发运 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
jokelone ebe34e4ba9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 a76d70851d 软适配 适配记录参数 分页查询 5 years ago
zcg ad08ff21bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao f8e3edabc3 【 7159 线边退料逻辑错误,应该为:扫描A条码,输入原条码的剩余数量,拆包生成的新条码留在线边,原条码退回仓库。若数量与原条码相等,则不做拆包。
】bug7159
5 years ago
wei.peng 391d4005ad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng f768247c4f 代码合并 2019-12-30 15:59:52 5 years ago
曾贞一 8b90b33e28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 2da366630f 【VDA波次配料--物料汇总优化】 5 years ago
钮海涛 14f47f1ab4 修改字段编辑弹出框 5 years ago
jokelone 39790fd50b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone d47a097c53 【任务:1344 通用接口增加批量数据处理】 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
zcg 1230906c3e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 6afa007224 新增拖拽接口 5 years ago
许心洁 ae83a432d9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 8143afeea9 拣货:条码的数量不能小于0+定时处理遗漏的待处理移动单JOB+closeTaskDetails函数还需要软删单据明细的状态 5 years ago
wei.peng 3b7b374b23 自定报表对象模型调整 5 years ago
汪云昊 ec1dbc5212 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 6b02d9969a 数据源批量写入优化 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
钮海涛 8b1ae09885 修改订单甘特图 5 years ago
汪云昊 2f3e680fac Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
E 9e47c4ac5a 【#1332 基础数据-容器类型管理】新增期限单位字段 5 years ago
汪云昊 20ccf65c5c 资源加载优化 5 years ago
汪云昊 d89ed44bcc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 1d9ab80ae8 数据源适配器 - 批量写入优化 5 years ago
zcg 192034152b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
WYnneaoapc 32c9bbbe85 task `1308` 4 同步国际化资源 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
钮海涛 629e2f8270 新增新增或保存字段信息接口 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
王杰 fb8b07b227 【需求:1329】 5 years ago
王杰 019cb91a4c 【需求:1329】 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
zcg dbe2d32bb6 [需求:1322,枚举修改] 5 years ago
jokelone f857a4065d 【任务:1327JIT生产】 5 years ago
E e5452056b6 【bug7083 KT器具管理】新增业务类型和作业类型 5 years ago
puxiao.liao 794992d687 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 734b54d1b2 【 领料上线扫描时,在扫描完条码后将目标库位带出。
】bug7024
5 years ago
钮海涛 04b02c084b 新增甘特图可拖拽资源提示功能 5 years ago
jokelone 0e84990f3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 20f6961daf 【任务:1327JIT生产】 5 years ago
qianhs 34e4d837af 【存调整盘点,扫描库位后,提示内容“零件号,条码,数量”】【bug7060 】 5 years ago
汪云昊 192f861591 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
汪云昊 d5c1f7a7a3 资源模块数据
模板软删除
软适配list传参
5 years ago
zcg 9175fc028f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg c7d494c31e [需求:1324,导出excel] 5 years ago
曾贞一 4bd0aa8d57 【系统配置-模糊查询 】 5 years ago
gcj c51de088d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj 9c2dcba09d 【运输管理】添加查询关联单号 5 years ago
zcg dccd104fdd [需求:1324,excel导出] 5 years ago
gcj 99eaa8b8ca Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
5 years ago
gcj fc9b8629ab 【采购收货】 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
E 996526ac7c 【bug7088 物料信息中的导入功能】 5 years ago
王杰 b0709aca97 枚举 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
钮海涛 335ab2ce51 新增KPI接口 5 years ago
王杰 c87b00756f dev分支修改pom 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
E 7ef04dd824 【1320 KT物料信息--需要维护物料的类型:器具】 5 years ago
gcj a7d1ec785b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
汪云昊 4705b77a7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 b674087ffc 资源导入优化 5 years ago
王杰 339f1a86c2 删除枚举代码中间的注释 5 years ago
puxiao.liao 0453363336 【发运配料界面显示将单据数量改为剩余配料数量。
】bug7063
5 years ago
王杰 423b81609a 【需求:1198】 5 years ago
qianhs fdfc5884c5 【 库存调整盘点(两个界面)需要可以扫描库位以后立刻提交。】【bug7040】 5 years ago
jokelone e2c9d9e569 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 54fe0ce760 【bug:6360 工厂初始化】 5 years ago
zcg b06ecdd3f3 [bug:7043,PCN节点-模块修改] 5 years ago
gcj 49134cc5b3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 81b84d86e5 新增KPI接口 5 years ago
WYnneaoapc 0191a17a4d Merge branch 'dev' into test 5 years ago
WYnneaoapc 0103c64247 task `1316` 1 拆分job任务 5 years ago
WYnneaoapc 9157020997 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj b29d84bbad 【运输管理】 5 years ago
WYnneaoapc e206057aba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
gcj ba355aab55 【运输管理】 5 years ago
jenkins 5513e95884 Jenkins自动合并 5 years ago
gcj 01e5919349 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
E b5006a88f1 【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】 5 years ago
jenkins 78d80f03cf Jenkins自动合并 5 years ago
qianhs 15d3d3b5e1 【 库存调整盘点(两个界面)需要可以扫描库位以后立刻提交。】【bug7040】 5 years ago
jenkins 34b843bd1f Jenkins自动合并 5 years ago
puxiao.liao 4f1455012f 【领料上线扫描时,在扫描完条码后将目标库位带出。
】bug7024
5 years ago
曾贞一 f800d3dd7b 【成品发运,获取在途库位逻辑修改】 5 years ago
WYnneaoapc 50f77a5081 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 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
WYnneaoapc a38dc051ac task `1308` 1 PCN国际化资源 5 years ago
汪云昊 38fc49f053 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2fb79b8354 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 14f1ced301 会话文件展示地址封装 5 years ago
jenkins 03051f4fd1 Jenkins自动合并 5 years ago
puxiao.liao 0c01ffb230 【在配料时,点击右上角放大镜,输入单号无法查询,并且显示的内容需要有来源,目标,是否紧急
】6978
5 years ago
许心洁 4b340e6954 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 773f56b577 TASK_INO_STATUS 20和30的枚举类名严重错误,容易误导开发 5 years ago
jenkins 8efcd210aa Jenkins自动合并 5 years ago
陈思洁 d0ddf208c3 【KT-1297 物流路线的【适用范围】优化】 5 years ago
jenkins 95048bce44 Jenkins自动合并 5 years ago
qianhs d4d30bf634 【 零件号条码打印,扫描后需要提示当前扫描零件,当前扫描数量,剩余扫描数量(标包减去扫描数量)。】【bug7020】 5 years ago
jenkins cd1696c787 Jenkins自动合并 5 years ago
汪云昊 4632c7572c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 1318c6ef56 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 3dd247491a 软件适配器异常信息优化 5 years ago
WYnneaoapc 129c84d4a8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc bc21d0b461 task `1308` 1 PCN国际化资源 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
jenkins 55dcb795c9 Jenkins自动合并 5 years ago
许心洁 e816c2fd6a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 258c1ccbe8 流程导入:优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库:只能移入库状态的条码;不可多人操作同一个库位进行整库移库 5 years ago
WYnneaoapc 2a3499de65 Merge branch 'dev' into test 5 years ago
WYnneaoapc 4182b4d852 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 6d357abe9f task `1304` 2 活化开线管控 5 years ago
jenkins 1594c49ca9 Jenkins自动合并 5 years ago
zcg f23b0f7bfe 解决冲突 5 years ago
陆卫豪 3e9c1aaa76 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
WYnneaoapc 7451bc9460 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into wynne_temp_wc 5 years ago
WYnneaoapc 99fd4221e2 task `1304` 1 活化开线管控 5 years ago
jenkins 0e35bd1d6b Jenkins自动合并 5 years ago
钮海涛 e0f81a73d7 修改甘特图日历接口 5 years ago
jenkins cfebb937fb Jenkins自动合并 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
jenkins 350f7101d2 Jenkins自动合并 5 years ago
jokelone f3756e6b34 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone b9b30cf19c 【任务:1306质量标准配置】 5 years ago
puxiao.liao da4f32f0b4 【在配料时,点击右上角放大镜,输入单号无法查询,并且显示的内容需要有来源,目标,是否紧急
】6978
5 years ago
gcj 59e7704f67 【运输管理】装车单 5 years ago
王杰 7bc434ed15 安灯组装模型优化 5 years ago
WYnneaoapc 84227c9b8a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc b3a04911b6 task `1300` 5 BI 产线运行情况 5 years ago
汪云昊 8e3c1b750a Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 35fd2f7952 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 3902fb6309 资源增量导入优化 5 years ago
王杰 dfb23bab1d Merge branch 'dev' into test 5 years ago
王杰 bc61b43e8d 安灯人员统计报表工位代码不显示问题修复 5 years ago
陆卫豪 5393d6e034 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 5 years ago
zcg 586dfb416b [mes枚举修改] 5 years ago
陈思洁 40c64db0b1 冲突 5 years ago
陈思洁 ee14ce1d4b 【KT-快速入库功能】 5 years ago
jenkins 015d284239 Jenkins自动合并 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
WYnneaoapc 168edce5bd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 48338fec28 task `1300` 5 BI 产线运行情况 5 years ago
jenkins 39f4c733a4 Jenkins自动合并 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
王杰 c4c615bd15 Merge branch 'dev' into test 5 years ago
王杰 3ff9fbc140 安灯图表 5 years ago
WYnneaoapc b088b40fd1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc a1a602e457 task `1300` 5 BI 产线运行情况 5 years ago
jokelone 6995189893 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 46ec9e51b0 【任务:1211报表导出冗余字段】 5 years ago