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

2973 Commits (66671bafb832077cea72b913ec654058e971843b)

Author SHA1 Message Date
puxiao.liao ffb45cf3dd 修复TJ MGN BUG 5 years ago
曾贞一 0f4a8c130c 【冲突解决】 5 years ago
曾贞一 41efdd4de8 【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】 5 years ago
puxiao.liao 0c044eed91 修复TJ MGN BUG 5 years ago
puxiao.liao 4ffe517015 修复TJ MGN BUG 5 years ago
puxiao.liao 07f6aabd72 修复TJ MGN BUG 5 years ago
rock.yu 16a2d75a17 结果生产报工job的sqlserver不兼容问题 5 years ago
rock.yu 352db6a7fa 工单拉动的日志保存到数据库 5 years ago
puxiao.liao 10edb8ebae Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
钮海涛 fa467a2e0d sweb合并dev代码 5 years ago
钮海涛 5f144781c9 SWEB合并test代码 5 years ago
钮海涛 6749bda558 合并dev代码 5 years ago
钮海涛 572e749bdb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 b253a020b9 合并test代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
puxiao.liao 2c3571b014 修复TJ MGN BUG 5 years ago
puxiao.liao f14cc48243 修复TJ MGN BUG 5 years ago
puxiao.liao e6b5caa61c 修复TJ MGN BUG 5 years ago
钮海涛 f9db132861 坤泰SWEBU9接口 5 years ago
rock.yu 17dae82081 增加麦格纳工单的滑动窗口计算逻辑 5 years ago
puxiao.liao 5e0c0a4051 修复TJ MGN BUG 5 years ago
puxiao.liao ae6ffa27f4 修复TJ MGN BUG 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
汪云昊 b38e6ea1ad Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 48443a57de 合并test代码 5 years ago
钮海涛 a3eb1e83f3 Fix Bug #11320,#11213 5 years ago
puxiao.liao 900fd5d5b7 MGN标准库存支持修改拆包 5 years ago
钮海涛 6e803445d7 Fix Bug #11320,#11213 5 years ago
钮海涛 485c66aaf7 合并test代码 5 years ago
曾贞一 6e252705ab Merge branch 'test' of helin.huang/i3plus-pojo-liquor into test 5 years ago
puxiao.liao 6e22be2d37 麦格纳ASN收货看板修改 5 years ago
liquor e75745380e 【11324 20011--北美收货自动打印时批次字段为2020-09-11，需要后台在传给前端时将后三位字符去除，变为2020-09用于客户目视化-0914】 5 years ago
曾贞一 f7fcb1f530 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3267a9b54f 【如东AGV接口】 5 years ago
puxiao.liao 92c2a49b90 麦格纳ASN新增异常 5 years ago
liquor ddf9936d74 在看板中增加了一列“来源库位”。 5 years ago
puxiao.liao 039fc9106b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 6765c58de2 Fix bug#11212 
生产报废的条码在条码状态中查询是入库状态 --20200914
 5 years ago
钮海涛 31791ea8cc Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 17c64fbf46 修改麦格纳最早批次问题 5 years ago
puxiao.liao 8ac53abe9e 麦格纳ASN新增异常 5 years ago
钮海涛 cb39559a3d Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 6cc11a637d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c947df6c66 【坤泰接口优化】 5 years ago
puxiao.liao 15a259c8b2 修复MGN系列BUG 5 years ago
钮海涛 cfd507438e 天津麦格纳问题修复 5 years ago
汪云昊 7a4be36111 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
puxiao.liao 97a8a5a6ec 修复MGN系列BUG 5 years ago
puxiao.liao 698128aff5 MGN修复BUG 5 years ago
曾贞一 99e63fea8c 【2741 北京麦格纳WMS-质检跳批】 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
曾贞一 193cff013f 【2737 09 1.2.1.9.1库位新增库位别名】 5 years ago
puxiao.liao 61b87d2d00 MGN修复BUG 5 years ago
puxiao.liao 15d915370e MGN修复BUG 5 years ago
曾贞一 6ca0948a5d 【11026 20011--有关北美收货产生的需求变更--0910】 5 years ago
puxiao.liao 9a7bef44ac MGN修复BUG 5 years ago
曾贞一 54dc09ff76 【冲突解决】 5 years ago
曾贞一 9ebe3c17b7 【枚举状态】 5 years ago
puxiao.liao 26367ea28d Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
rock.yu d7133b24f5 增加缺失的字段 5 years ago
曾贞一 92e8364b58 【1140 09 1.2.1.1.1客户发运车辆推荐】 5 years ago
曾贞一 62733aa799 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a53e7c5724 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
puxiao.liao acbad1a637 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
 5 years ago
puxiao.liao df4e794a48 修复MGN系列BUG 5 years ago
rock.yu 1e5fe42702 完成了麦格纳质检录入不良数量的功能 5 years ago
曾贞一 a0b50da83e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c06c504805 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
puxiao.liao 679ad59b86 Fix bug#10977 
19128+MES工单生成WMS领料任务无法生成+20200901
 5 years ago
puxiao.liao 0e89f89327 修复MGN系列BUG 5 years ago
puxiao.liao 137c45b5cc 修复MGN系列BUG 5 years ago
rock.yu 3935bde8f6 同步 SAP 数据同步 JOB（从仪征同步） 5 years ago
puxiao.liao 2527fe0163 修复MGN系列BUG 5 years ago
钮海涛 51746154ba 合并dev到test 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 98b992408c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
曾贞一 57aae56345 【2690 ext新增委外库存查询报表 -后端】 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
rock.yu f6b812aaf8 PDA组件原生支持脚本组件 5 years ago
rock.yu 9be1dd70d5 盘点明细表 lotno 字段增加默认值 5 years ago
puxiao.liao 36e9000710 麦格纳BUG 5 years ago
曾贞一 c1cb461f36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a9e97d4e28 【2688 08 extPDA-查询查看零件对应库位】 
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
 5 years ago
rock.yu 42187ebadc 完善流程管家日志信息 5 years ago
钮海涛 85395e84fd 合并dev代码 5 years ago
钮海涛 2013d47353 合并dev代码 5 years ago
曾贞一 ec7aee68a7 【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】 5 years ago
许心洁 2cc6abb902 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 291c0b2a40 BUG#10584,BUG#10784,BUG#10785 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
puxiao.liao 6d59e00fc5 Fix bug#10545 
10545 19081 -- 出入库界面更改 20200814
 5 years ago
puxiao.liao ba5befe291 Finish Task #2645 Cost:8h 
【PCR-20200525-003_委外出库条码变更】中的零件号转化
 5 years ago
曾贞一 d81a7bf22e 【接口映射优化】 5 years ago
陈思洁 d17161d359 【2658 LPS导入后端开发】 5 years ago
曾贞一 867ecc6d71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 15314209ae 【2636 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
puxiao.liao 9299f17c3b Fix bug#10671 
二维码收货扫描条码报错系统异常 --20200821
 5 years ago
曾贞一 d3ae797ba0 【坤泰接口开发】 
【质保周期检查组件--优化代码】
 5 years ago
rock.yu 5bfd542402 增加工单拉动 5 years ago
曾贞一 0b09e410f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 fe2017fbe4 【622 08 1.2.2.2.6 BOM增加虚阶零件】 5 years ago
钮海涛 228d3dd2ab Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 841742e474 托标签收货合并到二维码收货 5 years ago
puxiao.liao fde40074ce BUG修复 5 years ago
钮海涛 9878547daa 合并dev分支代码 5 years ago
钮海涛 f42ece4f6c 优化流程管家执行性能 5 years ago
钮海涛 2fb46609c3 sweb功能开发 5 years ago
曾贞一 8f7a7fcc32 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6ba2d2826a 【麦格纳问题】 5 years ago
许心洁 9bbc387818 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 4ec9858182 任务#2625 5 years ago
曾贞一 2bef33960c 【2617 08 1.2.2.2.4新增保质期检查组件】 5 years ago
许心洁 1c02cd6562 任务#2612，2613 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
ypf 523d2ffc80 关于欧洲领料看板逻辑实体的添加 5 years ago
许心洁 4a9e5cbb59 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 3a4c143563 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 14e68803df 增加根据物料号取库存地信息的微服务接口 5 years ago
许心洁 7dcd8a1627 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7482a6dd74 BUG#9928 和任务#2590 5 years ago
puxiao.liao f9061f5d27 BUG修复 5 years ago
qianhs 86c9bce2aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 067a859e83 【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】 5 years ago
钮海涛 933f2014ad Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 59a1acdafc 修复合并版本问题 5 years ago
puxiao.liao d5d16569bb Fix bug#10283 
20089+库存移动统计报表查询增加项目代码查询项
 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
rock.yu f368ec88cc 修改流程管家组件调用日志表 5 years ago
qianhs c872663847 Finish Task #2080 Cost:8h 5 years ago
rock.yu b928acae47 1. 流程管家增加记录组件执行耗时的功能 5 years ago
钮海涛 51bae8d1e6 Fix Bug #10312 修复动态搜索取不到列信息问题 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
曾贞一 f25a186d77 【2511 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
曾贞一 4ff84de904 【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】 5 years ago
puxiao.liao 5990e56dfd Finish Task #2540 Cost:8h 
喜德WMS-新增“回传源材料扣减结果”的接口映射
 5 years ago
钮海涛 e239c89e63 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
钮海涛 7f55af4477 Finish Task #2560 Cost:8h 5 years ago
钮海涛 5a64ce6021 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
puxiao.liao 937eac5e87 Finish Task #2549 Cost:4h 
自动生成领料单增加默认来源存储区、自动获取默认目标库位
 5 years ago
钮海涛 72c1363517 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f2cf6af1fe Finish Task #2523 Cost:16h 
Fix Bug #10065 已增加数据权限控制
 5 years ago
许心洁 46904c43d1 任务#2528，#2545 5 years ago
puxiao.liao 47f466d1d6 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao e85acdcfff Fix bug#9994 
库存明细--显示重复
 5 years ago
qianhs 958a45d3dd Finish Task #2080 Cost:8h 5 years ago
钮海涛 fd0f079a6a Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 34be0bde26 增加物料组功能 5 years ago
puxiao.liao 2e3f5bb2af Fix bug#9994 
库存明细--显示重复
 5 years ago
puxiao.liao 5f90efe691 Fix bug#9982 
19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727
 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
钮海涛 0eb571d717 Fix bug #9804 5 years ago
钮海涛 9bde10f13c 修复收货回执界面打不开问题 5 years ago
puxiao.liao 5006e0a938 Finish Task #2520 Cost:8h 
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
 5 years ago
puxiao.liao 31c3fcd868 泰国需求 5 years ago
钮海涛 3e95dd4029 修复北京麦格纳生产报工问题 5 years ago
puxiao.liao 88b85b03d2 Finish Task #2436 Cost:8h 
拣货、客户发运流程简化配置
 5 years ago
qianhs c9e4c72901 Finish Task #2080 Cost:8h 5 years ago
qianhs e17318dbcb Finish Task #2080 Cost:8h 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
qianhs 9461057a07 Finish Task #2080 Cost:8h 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao 5d62ebf26f Finish Task #2424 Cost:8h 
2424 07 1.2.3.7.1新增检查容器包装关系
 5 years ago
曾贞一 791acf7ae8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 dffdf88471 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
王杰 6de2bc5472 Merge branch 'test' into dev 5 years ago
puxiao.liao df125e71b9 泰国翻包 5 years ago
曾贞一 354d1290f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f99c5232be 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
曾贞一 c0cf08fa19 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
王杰 4260316f62 test merge dev 5 years ago
曾贞一 ef58d72067 【9514 欧洲-定制业务-RFID管理-查询条件无效】 5 years ago
puxiao.liao 9445989545 Finish Task #2338 Cost:4h 
2338 07 1.2.3.5.1客户发往地新增维护目标存储区
 5 years ago
曾贞一 000097a4c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 82e2366fa6 【2181 06 1.2.3.8 泰国WMS-容器包装关系接口-需求变更】 5 years ago
钮海涛 20a5443fa7 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c05e18db5b 合并源分支代码 5 years ago
王杰 a2f047553f pom 5 years ago
王杰 dc91809bb7 test merge dev 5 years ago
曾贞一 3620d2abd2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e9492a86b0 【2315 07 1.2.3.6.3欧洲WMS-RFID查询】 5 years ago
rock.yu c4f8497dda 通用接口的字段映射关系 JSON 中增加 seq 属性，发出的接口报文会按照此属性生序 
如果未配置此属性，则默认为 0，即无序
增加此段代码的单元测试用例
 5 years ago
曾贞一 5dfad71e39 【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】 
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
 5 years ago
qianhs f0b8cee974 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs ba6be25390 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 595266f536 Fix bug#9343 
19125+条码打印页面后端传值新增一个字段值，传表wms_part 字段color +0709
 5 years ago
曾贞一 0108649a73 【代码优化-优化】 5 years ago
曾贞一 c20159da6a 【上架策略-功能优化】 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
puxiao.liao f385be1d7c 无锡喜德BUG 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
曾贞一 50e2f18c0d 【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
汪云昊 39d6609a5f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 24474b4704 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c3398a6cc9 修改中航BH问题 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
曾贞一 f4edb471c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3d826c5edc 【智能化开发-日志记录优化】 5 years ago
puxiao.liao 559fc003c8 Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
puxiao.liao 37fb285aa9 海纳川智能化 5 years ago
曾贞一 7dddac5113 【智能化开发-锁定库位】 5 years ago
曾贞一 aa09a31957 【智能化开发-锁定库存】 5 years ago
许心洁 9d79ed5376 3D仓库规则引擎优化 5 years ago
许心洁 38b154b0cb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 6cd70eb695 3D仓库规则引擎优化 5 years ago
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
puxiao.liao 5269cfb732 BH 需求修改 5 years ago
钮海涛 62c9d8d27d 修复欧洲FIFO跳过未进行交易处理Bug 5 years ago
puxiao.liao 84253d7562 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao b9ac27df19 无锡喜德BUG 5 years ago
曾贞一 624e8d6461 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
曾贞一 b68f55b062 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
曾贞一 913991d30d 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
钮海涛 6c6fbf7e2c 新增收货回执显示收货时间功能 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
qianhs 98b0110ff3 Finish Task #2080 Cost:8h 5 years ago
曾贞一 9567d62195 【自动化策略】 5 years ago
曾贞一 e94e4ad189 【2180 06 1.2.3.8泰国WMS－生产报工接口】 
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】
【2180 06 1.2.3.8泰国WMS－生产报工接口】
 5 years ago
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 5 years ago
puxiao.liao ffc2d4d56c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
 5 years ago
puxiao.liao 49f9d06d5f Fix bug#9062 
无锡喜德-生产汇报（原材料/成品）用 函数取出来的父位置和子位置号可能会有多个-0620
 5 years ago
钮海涛 ac7e69e51e 修复版本问题 5 years ago
钮海涛 34e63db56c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 e340749f87 Finish Task #2196 Cost:4h 5 years ago
puxiao.liao 0818778346 自动化策略主表 5 years ago
曾贞一 68c3f087dc 【2180 06 1.2.3.8泰国WMS－生产报工接口】 5 years ago
puxiao.liao 0c0d43cd96 北京海纳川：采购入库组件 5 years ago
曾贞一 a59fa1bf9b 【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
曾贞一 99f1ba98b6 【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】 5 years ago
puxiao.liao 3fe454da39 Fix bug#8909 5 years ago
钮海涛 e457b50145 中航需求变更 5 years ago
曾贞一 5c2dcf8e10 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f3857116d1 【2074 06 1.2.3.8上架策略-计算COI值】 5 years ago
曾贞一 27cb1dddfe 【1603 委外扣减查询-需求变更】 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
袁津哲 adb974d874 合并test分支代码到dev分支 5 years ago
puxiao.liao 328967ff06 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2194715705 Fix bug#8736 5 years ago
qianhs f4ca720ce4 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 2b791901d2 Fix bug#8876 5 years ago
钮海涛 16574b6920 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 da454b3921 领料单界面显示erp单号问题 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
qianhs 057439d050 Finish Task #2080 Cost:8h 
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
 5 years ago
puxiao.liao 3173e43245 Fix bug#8742 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 97fb0bfd29 Fix Bug #8823 5 years ago
puxiao.liao 5c40073169 喜德BUG 修改 5 years ago
puxiao.liao 47a318f238 喜德BUG 修改 5 years ago
puxiao.liao bcb70400eb Finish Task #2027 Cost:10h 5 years ago
puxiao.liao 2133908ff5 Finish Task #2024 Cost:8h 5 years ago
钮海涛 fd45d66968 解决合并冲突 5 years ago
曾贞一 a2ef35082e 【1794 天津麦格纳WMS-报表-库位利用率看板】 5 years ago
puxiao.liao e57acfacee BH BUG 修改 5 years ago
puxiao.liao 454de274c7 Fix bug#8780 5 years ago
puxiao.liao 71d729b7f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 16f1ed34a5 Fix bug#8780 5 years ago
qianhs 6d4a1b6975 BH-CODE 出库，绑定 5 years ago
puxiao.liao 9a65fc95fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9975335acb Finish Task #2033 Cost:8h 5 years ago
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago