5365 Commits (8b750e6a769066153f99dc050f09d09f642dd62f)
 

Author SHA1 Message Date
汪云昊 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 4be9aa7dec Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 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