5246 Commits (763d72b128eb9037a4208a4eddb22743e2f35517)

Author SHA1 Message Date
汪云昊 05d6f132ce 表单拾取
任务检查功能优化
5 years ago
luweihao f358c13b04 ptl迁移4 5 years ago
jenkins 0961a7ce14 Jenkins自动合并 5 years ago
qianhs 9fe977e8c0 【 日生产计划生成的条码在条码打印界面只能补打,不能打印】【bug7514】 5 years ago
jenkins 106703a2be Jenkins自动合并 5 years ago
qianhs 8477526bf5 【 日生产计划生成的条码在条码打印界面只能补打,不能打印】【bug7514】 5 years ago
jenkins a9d94ecff7 Jenkins自动合并 5 years ago
luweihao bbfcdfdd64 ptl pojo 提交 5 years ago
luweihao 717b72e086 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao bc007c3d2b pojo提交 5 years ago
jenkins 6a91ce5c50 Jenkins自动合并 5 years ago
qianhs 8a9c8273d8 【 发运流程 20300, 20390 没有往 ref_item 字段填写对应的值】【bug7506】 5 years ago
jenkins 1a2b706e24 Jenkins自动合并 5 years ago
luweihao a2bf78c87e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 3bed5974f6 ptl pojo init 5 years ago
luweihao 73af305576 迁移20200213 2 5 years ago
jenkins 594577cc69 Jenkins自动合并 5 years ago
汪云昊 821d69bd06 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 8093290bad lac任务检查 5 years ago
puxiao.liao 901623b254 【 7510 领料,发运一步法做完之后在单据子表详情中条码状态任然为待处理。
】bug7510
5 years ago
jenkins 218899aae9 Jenkins自动合并 5 years ago
汪云昊 4708f43149 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao f9cb6be454 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 54b167256f 【 7510 领料,发运一步法做完之后在单据子表详情中条码状态任然为待处理。
】bug7510
5 years ago
jenkins 67a016b261 Jenkins自动合并 5 years ago
luweihao d750a88aad Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 1c144eca4d 移除mespcn乐观锁 5 years ago
jenkins f8fa1cd957 Jenkins自动合并 5 years ago
qianhs 9c754e5816 【 发运流程 20300, 20390 没有往 ref_item 字段填写对应的值】【bug7506】 5 years ago
jenkins 26fd59e5c7 Jenkins自动合并 5 years ago
puxiao.liao 96e0e3756f 【 7507 发运单接收接口新增字段
】bug7507
5 years ago
jenkins 24d834cd6d Jenkins自动合并 5 years ago
qianhs e1114d67d2 【静态盘点解冻调差时,如果勾选了所有盘点单,现在需要一个单子一个单子点击确认调差,需要在点击时将所有盘点单的调差范围都显示出来,然后一次性调差所有功能】【bug7485】 5 years ago
jenkins 7c422cad79 Jenkins自动合并 5 years ago
qianhs 591f865bf3 【成品打印需要带出客户零件号,先用单据所属的客户发往地+零件号去WMS_CUSTOMER_PART表中找客户零件号,如果找不到再用客户+零件号去找。】【bug7501】 5 years ago
jenkins 335c725bca Jenkins自动合并 5 years ago
qianhs 4ccda48061 【 PDA所有流程中,扫描后默认提示的组件去除】【bug7409】 5 years ago
jenkins af860ff688 Jenkins自动合并 5 years ago
钮海涛 03de37cf7c 修改导入导出进度明细。 5 years ago
钮海涛 4583b87bf5 添加导入导出进度明细。 5 years ago
jenkins 8c5020b098 Jenkins自动合并 5 years ago
曾贞一 9607c91582 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 44648e4218 【1396 亚太-领料任务明细看板】 5 years ago
jenkins f45a0d69b0 Jenkins自动合并 5 years ago
jokelone af31ba4884 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 54cd3cfc45 业务表增加唯一索引 5 years ago
钮海涛 e1225bbccd 添加执行命令组进度明细。 5 years ago
王杰 01e896a752 Merge branch 'dev' into test 5 years ago
曾贞一 60ab897195 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e14e813230 【7476 发运的新老标签对应报表】 5 years ago
luweihao d601ef9a32 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao acc907dd28 task `1295` mes添加索引 5 years ago
jenkins 27b1f5ca21 Jenkins自动合并 5 years ago
qianhs 22eaa30dab 【收货时,如果多收了零件号,点击重置后再扫描单号,该零件号明细无法显示在下方提示中。】【bug7423】 5 years ago
汪云昊 0bd38e8e9a 打印模板查询优化 5 years ago
王杰 cd93680349 Merge branch 'dev' into test 5 years ago
jokelone 799b691aaf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 5fc59129bd 【mes-pojo 继承Serializable】 5 years ago
luweihao 5f25e311bb mes-pcn pojo添加serializable 5 years ago
luweihao 6b66c15c72 Merge branch 'dev' into test 5 years ago
luweihao ab3ad4c2d5 task 去除生产数据注解 5 years ago
luweihao b27bbb6158 Merge branch 'dev' into test 5 years ago
王杰 3f77135a17 枚举 5 years ago
jenkins 138b2cf7b7 Jenkins自动合并 5 years ago
jokelone 2d807ea47a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 30cb7f7b9d 工单类型去除JIT类型 5 years ago
jenkins 1ae61084c5 Jenkins自动合并 5 years ago
曾贞一 c075875f28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 415ae5a45b 【7457 1.发运时,如果是两步发运,客户标签打印后,在做第二步发运出库时,需要扫描已经绑定的客户标签。】 5 years ago
jenkins 770d7175aa Jenkins自动合并 5 years ago
钮海涛 cf203390b8 修正时间段编辑类型 5 years ago
jenkins 6e545a7ec1 Jenkins自动合并 5 years ago
袁津哲 db6522fba3 优化动态搜索与自定义列表代码 5 years ago
luweihao 2c6a4464c3 Merge branch 'dev' into test 5 years ago
luweihao 667847afe7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao d3c817529f task `1408` 生产数据结构化 5 years ago
jenkins 521973a2f5 Jenkins自动合并 5 years ago
zcg db3b06071d 【枚举修改】 5 years ago
zcg 8a04ca4e3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg bc1825fd35 【mes枚举修改,mesModel修改,pcn枚举修改】 5 years ago
luweihao 503f528e78 Merge branch 'dev' into test 5 years ago
luweihao a094473333 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 4ae13f8270 task `1408` 生产数据结构化 5 years ago
jenkins cf44b8866a Jenkins自动合并 5 years ago
钮海涛 9e0158e749 修改test分支POM配置 5 years ago
jenkins c90df4e96a Jenkins自动合并 5 years ago
许心洁 28ce8615fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 51d60a107a SAP指令锁定逻辑修改:
根据单号查询(之前:任务明细;现在:单据明细)获取行号记录到sap_order_lock表;
原因:SAP要的是单据的行号,任务明细可能是单据明细的拆分或者合并所得,行号不一定准;
5 years ago
jenkins f927ee21ac Jenkins自动合并 5 years ago
王杰 bf71cd07d0 JIS发运 5 years ago
jenkins 7e6f83a974 Jenkins自动合并 5 years ago
陈思洁 babc158ed6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 5feae0dd1a 【1405 物流路线在物品分类及仓库级别的应用】 5 years ago
陈思洁 09339a6e1f 【1405 物流路线在物品分类及仓库级别的应用】 5 years ago
jenkins a3823f4a16 Jenkins自动合并 5 years ago
袁津哲 2d30f2da0f Wms动态搜索与自定义列表,表单开发 5 years ago
wei.peng b199c5995f Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test
# Conflicts:
#	modules/i3plus-ics-console/src/main/resources/application.properties
#	modules/i3plus-ics-gateway/src/main/resources/application.properties
#	modules/i3plus-ics-regist/src/main/resources/application.properties
5 years ago
jenkins 134757c92b Jenkins自动合并 5 years ago
wei.peng 32d715a29c APS 调用失败bug 修复
动态报表 下拉问题修复
5 years ago
宋军超 964afe73cd 2020-01-16 16:42 添加自定义列枚举 5 years ago
宋军超 ed5a3b5acd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 851067b8d2 2020-01-16 16:37 自定义列表优化 5 years ago
jenkins d790bcf355 Jenkins自动合并 5 years ago
luweihao 4275e1d537 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 6ec43ea151 task `1392` 修正索引 5 years ago
袁津哲 67ef5c5516 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 89a7cafee4 Wms动态搜索与自定义列表,表单开发 5 years ago
luweihao 85675cdad6 Merge branch 'dev' into test 5 years ago
luweihao 88d1e39578 压测计时 5 years ago
jenkins 33e68b7e9f Jenkins自动合并 5 years ago
wei.peng cb68f62e46 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 8a4974f369 自定义报表 调用调整 5 years ago
jenkins 6371e8df60 Jenkins自动合并 5 years ago
袁津哲 f7c98e3982 Wms动态搜索与自定义列表,表单开发 5 years ago
jenkins a19cace3b1 Jenkins自动合并 5 years ago
puxiao.liao 86b73d43f9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 6f82fa17fd Jenkins自动合并 5 years ago
许心洁 889c6ac548 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7f7c9ebf6e SAP指令锁定组件逻辑修改:若根据单据号查询到了记录则不再新增了,并且调用此组件时缓存中一定得存在ORDER_NO;
定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口
5 years ago
qianhs a1ec8d7293 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins da70df25ac Jenkins自动合并 5 years ago
puxiao.liao 347197f305 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao b64327831a 【 7402 收货回执界面,查询条件增加一个ASN组号,显示列表中也增加一个ASN组号
】bug7402
5 years ago
jokelone 3f0646403f 【bug:7408报表优化1】 5 years ago
王杰 2f5b9954d0 Merge branch 'dev' into test 5 years ago
jokelone 68e7dc8906 【bug:7408报表优化】 5 years ago
luweihao 55fad978a6 Merge branch 'dev' into test 5 years ago
钮海涛 9e34d99d9e 修复资源甘特图拖拽问题 5 years ago
jenkins 69ff58a67e Jenkins自动合并 5 years ago
qianhs 61303a9f38 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 002ce795f4 Jenkins自动合并 5 years ago
luweihao 01a694be70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 6baeeee71e task `1392` 调整工步 错误处理实现 5 years ago
jenkins 458137d216 Jenkins自动合并 5 years ago
许心洁 c2ba0a5663 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 fff79a7846 GROUP_COMMIT_MODE枚举漏提交 5 years ago
jenkins e967001c75 Jenkins自动合并 5 years ago
许心洁 cb7f868d64 任务#1403 流程isCommitRefMove属性改为commitMode 5 years ago
许心洁 0e54d9a5b6 任务#1403 流程isCommitRefMove属性改为commitMode 5 years ago
袁津哲 ad8e51dfae Wms动态搜索与自定义列表,表单开发 5 years ago
jenkins c1609539cf Jenkins自动合并 5 years ago
许心洁 8eb74cef4d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 8c0b298cfe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone fd1a0ebdb8 【任务:1404 过程质量 检查项类型分组展示】 5 years ago
许心洁 de0d57179c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 35839db806 BUG#7359 任务列表分组字段和移动单赋值逻辑更改 5 years ago
jenkins 006fd3aef3 Jenkins自动合并 5 years ago
曾贞一 3a9e719005 【vda收货时,是否分组提交】 5 years ago
jenkins 8f6b53c5ea Jenkins自动合并 5 years ago
wei.peng 3e31641b20 PTL 项目初始化
PTL PCN 项目初始化
5 years ago
wei.peng e1dd7c3cdd PTL 项目初始化 5 years ago
jenkins 274011537c Jenkins自动合并 5 years ago
luweihao 325399127e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
luweihao 28587fbb98 task `1392` 调整工步 错误处理实现 5 years ago
qianhs f1afdf92e9 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 24f9ed25c2 Jenkins自动合并 5 years ago
qianhs 9d744318cd 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins a0b67a3723 Jenkins自动合并 5 years ago
袁津哲 8285c87624 Wms动态搜索与自定义列表,表单开发 5 years ago
jokelone 2d8b55b61a 【现场优化:59 过程质量】 5 years ago
jokelone 64f4486924 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 8ef70ed627 【现场优化:59 过程质量优化】 5 years ago
jenkins 16a414192f Jenkins自动合并 5 years ago
曾贞一 c543043da5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 328f2e64c5 【同批次修改】 5 years ago
qianhs 2eb14492d4 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 7057c685cc Jenkins自动合并 5 years ago
zcg 2396863bab 【任务:1383 数据监听定时数据抓取】 5 years ago
E c7a2c79f26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 64438ac61c Jenkins自动合并 5 years ago
qianhs 41047a17c1 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
jenkins 8e168c5109 Jenkins自动合并 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
wei.peng 503f3cd7a3 自定义表单功能优化 5 years ago
曾贞一 582115f999 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 5c841c706b 【7201 收货BOP移库流程图】 5 years ago
jenkins e88b93a22c Jenkins自动合并 5 years ago
gcj 8245950fd3 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
gcj 51c66e9279 【宁德问题清单】 5 years ago
jenkins 8d614aef8d Jenkins自动合并 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
jenkins 782574c73d Jenkins自动合并 5 years ago
袁津哲 29220002b1 Wms动态搜索与自定义列表,表单开发 5 years ago
jenkins 56e53906ec Jenkins自动合并 5 years ago
袁津哲 73e8287e1f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 cf92fb2b23 Wms动态搜索与自定义列表,表单开发 5 years ago
jokelone f1096e9ec5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 51839d7be5 【任务:1381】 5 years ago
zcg 0a8385495e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg add40a27e3 【任务:1382,数据监听基础模块开发】 5 years ago
qianhs 241350ae83 【盘点--调差后库存对不上(C202001070020,C202001070021)】【bug7314 】 5 years ago
E 0cc70fe2d0 【#1390 基础数据-客户信息增加导入功能】 5 years ago
jenkins b71be613fc Jenkins自动合并 5 years ago
WYnneaoapc ded27853a8 task 修改生产数据 5 years ago
jenkins 3db9a86504 Jenkins自动合并 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
王杰 031d57e081 JIS 5 years ago
jenkins ebcde1d16b Jenkins自动合并 5 years ago
jokelone c905343349 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0a70a42336 【任务:1381 兼容Sql server】 5 years ago
许心洁 46b8c6babb Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
jenkins fe71007a5c Jenkins自动合并 5 years ago
袁津哲 42bbb852c4 Wms初始化扫描实体字段新增逻辑优化 5 years ago
汪云昊 536200cf2b Merge remote-tracking branch 'remotes/origin/dev' into test 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
宋军超 d05fd542b3 2020-01-08添加列表菜单与对应和关系逻辑 5 years ago
袁津哲 e5138ac4e9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 e1386275d0 Wms初始化扫描实体字段新增逻辑优化 5 years ago
宋军超 b9f3ea144f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 bca93691ba 2020-01-08添加列表菜单与对应和关系逻辑 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
jenkins ae8475de5d Jenkins自动合并 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
jenkins 852be5a130 Jenkins自动合并 5 years ago
袁津哲 76b5087e60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 f323637c94 Wms初始化扫描实体字段新增逻辑优化 5 years ago
jenkins b0bbf43a9b Jenkins自动合并 5 years ago
宋军超 5a24a08c00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b0f60a9176 2020-01-08创建动态列表与查询model 5 years ago
钮海涛 68fc275565 修复资源甘特图拖拽问题 5 years ago
jenkins 75dc17f4c4 Jenkins自动合并 5 years ago
jokelone d0cd9d03b9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone 0d7aca73a8 【需求:7315 生产工单变更】 5 years ago
王杰 54bdf8f6a0 JIS 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
jenkins 54d6d1f340 Jenkins自动合并 5 years ago
WYnneaoapc b1d030e0dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 189bece3f7 Jenkins自动合并 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
王杰 685d7949bf Merge branch 'dev' into test 5 years ago
zcg d8f6a5273c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 a2041a4900 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 7d63a933c0 生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家:加上可设置是否提交逻辑 5 years ago
zcg b84a305b26 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 497b963f60 Jenkins自动合并 5 years ago
王杰 bf62494236 JIS 5 years ago
jenkins fa4cc8610f Jenkins自动合并 5 years ago
puxiao.liao 8584946ce5 【 条码状态报表,导出时下列三个字段为中文
】bug7196
5 years ago
WYnneaoapc a9f2cf2501 task 1309 大数据检索 5 years ago
zcg c86f3e280e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 0a0124cd2b Merge branch 'dev' into test 5 years ago
jokelone c3a7e0057b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jokelone fea1811191 【bug:7153 JIT排序】 5 years ago
王杰 4f8898d57a Merge branch 'dev' into test 5 years ago
王杰 bcec1d7e62 JIS 5 years ago
王杰 f88041df1e Merge branch 'dev' into test 5 years ago
王杰 3fe50125ae JIS 5 years ago
jokelone c226e61acf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg d9990f0cb8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins a685cd208d Jenkins自动合并 5 years ago
许心洁 267ec6c647 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wei.peng 823f818abf Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
许心洁 fe809e2eff 定时处理遗漏的待处理移动单JOB:处理周期改为可配置的JOB参数+流程管家:在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错 5 years ago
wei.peng 44af186f2f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg f2d73a0687 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 1995e55b40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 989e05c64c 【7168 对于发运单标签补打功能,根据发运单中的ship-to获取标签模板进行打印】 5 years ago
wei.peng d8d47541df 自定义报表调整 5 years ago
wei.peng af6083ddff 日志存储优化 5 years ago
WYnneaoapc 227354923e Merge branch 'test' 5 years ago
jenkins c14ef88ea8 Jenkins自动合并 5 years ago
jokelone 68eb60c6cb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 74be235a26 修复资源甘特图拖拽问题 5 years ago
钮海涛 b0bbd132c6 修复资源甘特图拖拽问题 5 years ago
zcg f38e54e496 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
jenkins 422aa1835f Jenkins自动合并 5 years ago
钮海涛 4013ed776b 修复炉资源排程问题 5 years ago
jenkins dfb06def2b Jenkins自动合并 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
qianhs 81bab75132 【库存调整盘点需要修改为,扫描新的库位时就对上一个库位中的数据做调整(更新条码状态),每个库位的扫描数据还是存在同一张盘点单内,点击提交时该张盘点单关闭。去除页面上的未盘移库按钮,未盘条码直接做移库。】【bug7148 】 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
WYnneaoapc 3425a57669 Merge branch 'test' 5 years ago
WYnneaoapc 430e5ad6dd Merge branch 'dev' into test 5 years ago
WYnneaoapc 76c84631ab revise class name 5 years ago
WYnneaoapc adb4bd2a1c Merge branch 'dev' into test 5 years ago
puxiao.liao 0d2df2ec43 【 7194 Po明细导出,单据状态为中文
】bug7194
5 years ago
puxiao.liao a3a5e63baa 【 7194 Po明细导出,单据状态为中文
】bug7194
5 years ago
王杰 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
许心洁 95c01ba24e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
jenkins 24c191a44b Jenkins自动合并 5 years ago
E a1276b5542 【#1338 库位物料中需要增加批量导入】 5 years ago
jenkins f4188e8361 Jenkins自动合并 5 years ago
许心洁 a231651315 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
WYnneaoapc 372cc438f2 Merge branch 'test' 5 years ago
WYnneaoapc 0a7f6ebf24 Merge branch 'dev' into test 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
jenkins 774e5015c6 Jenkins自动合并 5 years ago
钮海涛 2eb244c41c 修改资源甘特图侧边栏显示内容 5 years ago
许心洁 9a272f8b6a BUG#6755:移动单监听队列新增逻辑:如果当前处理的移动单的交易类型配置成需要推送异常邮件,并且全局参数“系统管理员”也有配置,则随送异常邮件 5 years ago
jenkins a104276c01 Jenkins自动合并 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
jenkins 688d976683 Jenkins自动合并 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
WYnneaoapc 92a657a874 Merge branch 'test' 5 years ago
WYnneaoapc 569c2613fe Merge branch 'dev' into test 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
jenkins 028ae09f9c Jenkins自动合并 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
许心洁 ef5013cbe0 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
jenkins d98b05e479 Jenkins自动合并 5 years ago
钮海涛 6afa007224 新增拖拽接口 5 years ago
jenkins d32900413a Jenkins自动合并 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
汪云昊 b12f67e34b Merge remote-tracking branch 'remotes/origin/dev' into test 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
王杰 9034418b7e 解决冲突 5 years ago
jenkins 9ee137a5c3 Jenkins自动合并 5 years ago
gcj 5c838ebcf1 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
gcj 62c50e04cc 【宁德问题清单】 5 years ago
jenkins c830600235 Jenkins自动合并 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
王杰 7287aaeb77 其他组未提交的代码 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
jenkins 471016b345 Jenkins自动合并 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
jenkins b96d22b011 Jenkins自动合并 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
jenkins e306cc6cdc Jenkins自动合并 5 years ago
qianhs 7f69df95df 【存调整盘点,扫描库位后,提示内容“零件号,条码,数量”】【bug7060 】 5 years ago
jenkins 1163faaac1 Jenkins自动合并 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
陆卫豪 56fe97e200 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 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
王杰 3ddadad142 Merge branch 'dev' into test 5 years ago
王杰 fb8b07b227 【需求:1329】 5 years ago
王杰 019cb91a4c 【需求:1329】 5 years ago
jenkins 320607590b Jenkins自动合并 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
王杰 91ab421d5e Merge branch 'dev' into test 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
王杰 06afd98334 Merge branch 'dev' into test 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
jenkins 6a19a07fce Jenkins自动合并 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
王杰 2655fdc87f Merge branch 'dev' into test 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
jenkins f39163513c Jenkins自动合并 5 years ago
曾贞一 4bd0aa8d57 【系统配置-模糊查询 】 5 years ago
jenkins 1fbd9c4357 Jenkins自动合并 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
jenkins 4e8ee475b4 Jenkins自动合并 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
jenkins cc45dbc2cb Jenkins自动合并 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
王杰 90de0f7df6 Merge branch 'dev' into test 5 years ago
王杰 b0709aca97 枚举 5 years ago
jenkins 695a9b2e63 Jenkins自动合并 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
王杰 ab68895760 test分支修改pom 5 years ago
王杰 c87b00756f dev分支修改pom 5 years ago
WYnneaoapc 9de807ab24 Merge branch 'test' 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 51623754c7 Merge branch 'test' 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 7ecae4d56b Merge branch 'test' 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