4819 Commits (4cddb73d35e0d68c1a98b7efc9059863713685da)

Author SHA1 Message Date
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