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

3263 Commits (6d88569204e74ae4360c610de379475972c20a72)

Author SHA1 Message Date
钮海涛 48b4e45850 Merge remote-tracking branch 'remotes/origin/test' into dev 4 years ago
钮海涛 6e5ea4462f 合并master代码 4 years ago
钮海涛 977b8ac23c Merge remote-tracking branch 'remotes/origin/test' 4 years ago
puxiao.liao 6c2569ee92 盘点优化 4 years ago
钮海涛 ded63e25db 坤泰问题修复 4 years ago
shun c067c671a9 无锡喜德 4 years ago
shun 6f9d4b4342 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 d089d0fba8 Merge branch 'test' into dev 4 years ago
许心洁 1595f68723 任务#3036 4 years ago
shun 2fd1b89425 无锡喜德WMS看板 4 years ago
王杰 cd5b882e1f dev merge test pom 冲突解决 4 years ago
许心洁 3f72f2ac66 合并TEST分支代码 4 years ago
许心洁 3cf59e9edc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 88d2eefcc8 供应商信息中的供应商地址因为之前漏加自定义搜索注解，导致界面上无法维护，现修复 4 years ago
liangyao 9f1312e906 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
liangyao ae2469e463 北京领料任务提交 4 years ago
许心洁 3d1d05ef1c 1.天津委外发运库存移动单打印 4 years ago
许心洁 1474be7486 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 30a6ef7ba5 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
许心洁 3467893051 1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读 
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
 4 years ago
曾贞一 15452dfa0e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 b695ab2fc3 【10202 20011--发运一步法配料时】 4 years ago
wynne1005 b7c4e76163 增加joined注解 4 years ago
puxiao.liao eb56d52e17 盘点优化 4 years ago
钮海涛 7a7169386a Merge remote-tracking branch 'origin/test' into test 4 years ago
钮海涛 c4023d4bac 坤泰问题修复 4 years ago
puxiao.liao 0bb69b6505 优化盘点 4 years ago
钮海涛 3b700e722c Merge remote-tracking branch 'origin/test' into test 4 years ago
wynne1005 b438735172 Merge branch 'test' into ext-dev 4 years ago
rock.yu 2f912b2334 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
rock.yu fe23cab34b 增加实体扩展注解 4 years ago
钮海涛 231c4b015a 修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题 4 years ago
puxiao.liao 9cd011c6ca 修复盘点BUG 4 years ago
liangyao 88aea83c1a 北京领料任务提交 4 years ago
simon.song effc34f74d Merge remote-tracking branch 'remotes/origin/test' into ext-dev 
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/pom.xml
 4 years ago
许心洁 d4696b54a3 墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举 4 years ago
liangyao 4b79ab806e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
钮海涛 3b3f0c98db 修复坤泰问题~ 4 years ago
liangyao d176895a5d 北京领料任务提交 4 years ago
liangyao e5c7432093 北京领料任务提交 4 years ago
廖普小 4b0c9b927f Merge branch 'test' of channing.zhang/i3plus-pojo into test 4 years ago
许心洁 de9578d439 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 4 years ago
许心洁 02decfe9c4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 5c1164a938 墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成") 4 years ago
小梁不胖 9508bd41ac 北京领料任务提交 4 years ago
小梁不胖 f744b94e87 北京领料报表提交 4 years ago
puxiao.liao a62b10dc9d 修复合并异常 4 years ago
钮海涛 dfc18cc9b2 Merge remote-tracking branch 'origin/test' into test 4 years ago
钮海涛 ffbc5d605e 喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB 4 years ago
钮海涛 b5c994a18b sweb同一供应商编码命名为VendorNo 4 years ago
simon.song 9b57f47af6 修改pom文件 5 years ago
simon.song 3917408421 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
rock.yu 785152dbfa 接口同步状态赋予默认值 5 years ago
Dominic_Xiao 86f9faa01d Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao ca18bb40cd 修复天津单据明细查询对应条码：单据条码增加行号查询条件 5 years ago
许心洁 4a38aab5b6 任务#2989 5 years ago
wynne1005 d893e76ab4 merge 5 years ago
Dominic_Xiao 167b0dad0c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao 46cc056a43 修复天津BUG 5 years ago
simon 55188db083 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 af732b7a4f 合并test代码 5 years ago
许心洁 6005e2ab66 Merge remote-tracking branch 'origin/test' into test 5 years ago
许心洁 7aa7738a59 BUG#12600 5 years ago
duan.yang a38be26538 采购订单表-主表添加同步标识、接口映射方向类型添加 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
duan.yang 787629581f 接口映射方向类型添加SWEB2SAP 
Signed-off-by: duan.yang <994300880@qq.com>
 5 years ago
许心洁 c1e3b01524 BUG#12504 5 years ago
许心洁 ee37d6f5eb 任务#12597 5 years ago
许心洁 c04895784a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 a604e70771 BUG#12711 5 years ago
许心洁 3ebcfd21e7 BUG#12711,12509 5 years ago
puxiao.liao 21cfe5c740 Fix bug#12004 
19058-KT其他出库用例
 5 years ago
rock.yu 70f659593b 通用接口增加 cron 表达式的支持 5 years ago
许心洁 be272fd12e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 2d47eeb84d BUG#12487 5 years ago
钮海涛 12edbb64d5 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 6fe792f75b posn新增供应商生产批次字段 5 years ago
wynne1005 db87c0c32f pom版本 5 years ago
puxiao.liao a6ca2b35d3 修复北京特殊领料 5 years ago
puxiao.liao 4392b513f7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 7381ac2ca0 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 bf51e5bb7a 修改登录平台为固定密码 5 years ago
puxiao.liao 9d7ae4a90f 修复北京特殊领料 5 years ago
钮海涛 b9283ec075 合并dev代码 5 years ago
钮海涛 b57ae573ed 合并test代码 5 years ago
钮海涛 89a45d326b 合并test代码 5 years ago
钮海涛 f63813d66d 合并master代码 5 years ago
钮海涛 ceebe541f2 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
puxiao.liao e250883f22 Fix bug#12004 
19058-KT其他出库用例
 5 years ago
许心洁 0f5ab7b144 BUG#12609 5 years ago
许心洁 359e085aac BUG#12430 5 years ago
许心洁 063ba20f74 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 8e5c2f4b00 BUG#12170,12417,12166,12437,12452 5 years ago
汪云昊 f2180f18f3 revert(pojo):还原pom版本 5 years ago
汪云昊 cc947c08f5 revert(pojo):还原pom版本 5 years ago
钮海涛 e9ec997e05 Fix Bug #12413 查询库存条码错误 5 years ago
puxiao.liao dc3e344f11 Fix bug#12401 
19048-发运单支持关联多个470单据号
 5 years ago
许心洁 4300201f99 BUG#12430,12495 5 years ago
许心洁 cbd0b1f136 BUG#12496 5 years ago
许心洁 e59f67e84b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 e3e4e1fc84 修复坤泰问题 5 years ago
许心洁 ecdc5888a4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 e5aefee838 BUG#12166 5 years ago
puxiao.liao 5f6a7c9a98 Fix bug#12380 
19048-支持批量下发BOM的功能
 5 years ago
许心洁 2d9521e412 BUG#12166 5 years ago
puxiao.liao 7b8597dde4 天津麦格纳看板BUG修复 5 years ago
puxiao.liao b124db3383 天津麦格纳看板BUG修复 5 years ago
rock.yu d226c27c2b 邮件推送增加获取附件的脚本功能 
增加发送附件功能
 5 years ago
puxiao.liao c6031c2f28 天津麦格纳看板BUG修复 5 years ago
rock.yu 65b26a0696 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu a300e6e2f8 idoc 记录表增加 erp 状态字段 5 years ago
puxiao.liao 7ec1bc61b0 天津麦格纳看板BUG修复 5 years ago
puxiao.liao 71e70e9a94 天津麦格纳看板BUG修复 5 years ago
rock.yu 510845c185 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu d41d14b112 增加 erp doc no 字段 5 years ago
许心洁 7dba4e7f32 BUG#12166 5 years ago
许心洁 4d5ffce7ac 任务#2933 5 years ago
puxiao.liao 679ef67457 天津麦格纳看板BUG修复 5 years ago
Aisiyu 79161c6703 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 303fe5907d [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
rock.yu 7162664b79 通用接口增加SID记录 5 years ago
puxiao.liao 274191aee2 天津麦格纳看板BUG修复 5 years ago
许心洁 82dc8eafbb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 3a5e446e90 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 b318abb4b8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 77d8aa4bdd 修改天津工单拉动逻辑 5 years ago
Aisiyu 2ca398468f [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
许心洁 29a5d01620 BUG#2938 5 years ago
puxiao.liao c0d52b93f7 天津麦格纳看板BUG修复 5 years ago
puxiao.liao cd2076d66a 天津麦格纳看板BUG修复 5 years ago
puxiao.liao 08011a5722 天津麦格纳看板BUG修复 5 years ago
Aisiyu 0ea3354b70 [1211 天津麦格纳货运看板和asn看板时间和count ] 5 years ago
许心洁 d1fb133839 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 346a5088ff BUG#12231 5 years ago
Aisiyu d819821234 [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
Aisiyu be7f6a4a92 [1211 天津麦格纳货运看板和asn看板修改 ] 5 years ago
puxiao.liao 67419496cb 修复天津麦格纳BUG 5 years ago
Aisiyu 6b9fcb2da9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu ab0b8a2af1 [1211 天津麦格纳货运看板sql 修改 ] 5 years ago
汪云昊 1825cfbdf3 revert(pojo):还原pom版本 5 years ago
puxiao.liao a844a4d59b 天津麦格纳修复BUG 5 years ago
Aisiyu 219dd0ddd7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 47f464b01d [1211 天津麦格纳货运看板 ] 5 years ago
曾贞一 143e2f1947 【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】 5 years ago
puxiao.liao e68735be83 MOVE_SN 增加 left_code 属性 5 years ago
许心洁 08125e3b0f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 4ee1875097 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 8d91675109 【12155 20145+系统参数页面，参数编码也支持模糊查询】 5 years ago
puxiao.liao e6e5982d73 Fix bug#12020 
19058-KT根据销售订单创建销售出库单（客户发运）
 5 years ago
汪云昊 dceb9b17a5 revert(pojo):还原pom版本 5 years ago
汪云昊 91f68d50d4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
曾贞一 b979a9471c 【11883 20021--北美领料需求变更--1023】 5 years ago
Aisiyu 3b5cd84e6e Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 e55e8b6f74 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 5e8b023fd5 【11883 20021--北美领料需求变更--1023】 5 years ago
puxiao.liao 762f9d4a9b Fix bug#12020 
19058-KT根据销售订单创建销售出库单（客户发运）
 5 years ago
Aisiyu 8b94991408 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 2db034a7f8 [1211 天津麦格纳WMS-ASN到货看板 ] 5 years ago
puxiao.liao 6269ee358c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 2bc15b56ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 d8e5aa44bc pom.xml 5 years ago
许心洁 92fec185b8 任务#28142909 5 years ago
曾贞一 9a350912ea Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
 5 years ago
曾贞一 5487c165ff 【11883 20021--北美领料需求变更--1023】 5 years ago
puxiao.liao 87611856dd 天津麦格纳多级BOM 5 years ago
rock.yu 104fa0efa5 完成ERP库存差异报表 5 years ago
曾贞一 c9378a7d8c 【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】 5 years ago
许心洁 38ddd82ef9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 d7bad41b29 天津麦格纳BUG#12111，12110，12108，12105 5 years ago
puxiao.liao 760307910a 天津MGN系列BUG修复 5 years ago
rock.yu 3ad59884a8 增加计算工单的提前时间属性 5 years ago
rock.yu 330cede03e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu b6a309bacf 增加 ERP 对账数据表 5 years ago
puxiao.liao 6f239ee756 Fix bug#12019 
12019-KT根据销售订单创建销售出库单（客户发运）
 5 years ago
许心洁 586365dc69 任务#2893,#2894,#2901 5 years ago
puxiao.liao 24acb86dff 实时库存查询&导出优化 5 years ago
puxiao.liao 62d5d62cef 北京MGN系列BUG修复 5 years ago
rock.yu a953523245 增加 ERP 快照相关表 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
钮海涛 1037ad6e68 修复问题 5 years ago
puxiao.liao 3de97d5b98 北京MGN系列BUG修复 5 years ago
puxiao.liao 6907ab6dc0 北京麦格纳看板需求 5 years ago
许心洁 8c4ae6ff34 任务#2893,2894 5 years ago
puxiao.liao 0216cf59c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 051417c10e 北京麦格纳看板 5 years ago
钮海涛 ef7a20a719 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 505de36ca5 修改SWeb供应商登录接口 5 years ago
puxiao.liao 56deedeaf3 北京麦格纳看板 5 years ago
puxiao.liao c965a34236 北京麦格纳看板 5 years ago
puxiao.liao ba81af744b 北京麦格纳看板 5 years ago
puxiao.liao ceb882cef4 天津MGN修复BUG 5 years ago
puxiao.liao 4ca43f81cc 北京麦格纳JIS发运看板 5 years ago
钮海涛 34a3c9553d Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 bf41628114 修改物料的标准质检时间类型为浮点数，精度为2 5 years ago
puxiao.liao 1aebc6761c Fix bug#11878 
19081-增加库存交易推算报表-1016
 5 years ago
钮海涛 3e89aa9425 乐观锁增加默认值设置 5 years ago
钮海涛 61d123cfc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 93626dad0f 新增质检完成状态报表 5 years ago
rock.yu 269f072fb8 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 8ed135734d 天津麦格纳BUG 5 years ago
钮海涛 7bdecfe687 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 07282396d2 ASN到货看板问题修复 5 years ago
rock.yu 9a2b6fe43a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu c3bdf4a162 解决10330库存扣减不准的问题 5 years ago
puxiao.liao ee700ab5b0 天津麦格纳多级BOM 5 years ago
puxiao.liao 75520519de 修复天津麦格纳BUG 5 years ago
puxiao.liao cfd0cb03ff 天津麦格纳BUG修复 5 years ago
rock.yu 8932108cd3 暂时去掉乐观锁 5 years ago
rock.yu df9474807c 库存条码表、库存表 增加版本号，用乐观锁控制并发问题 5 years ago
puxiao.liao 08687a7e14 修复天津麦格纳BUG 5 years ago
puxiao.liao 7508796daa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 44b5635e78 天津麦格纳PO生产任务增加关联行号 5 years ago
钮海涛 01d67fdd1f Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 7a29b85848 Fix Bug #11733 新增采购订货进度可以编辑原因 5 years ago
puxiao.liao 6a42b517fc Fix Task#2839 
武汉PRD-WMS&TMS装车明细接口
 5 years ago
puxiao.liao c7e5524a0a 修复无条码生产扣减增加扣减条码状态只能为入库，合格 5 years ago
钮海涛 3d5729e28b 自动打印队列增加供应商 5 years ago
puxiao.liao 90d94f35c8 Fix bug#11683 
质检单-已收货数量-显示优化
 5 years ago
钮海涛 5a0178f5df 合并dev代码 5 years ago
钮海涛 af4bb83f85 sweb合并test代码 5 years ago
钮海涛 1695d75ff2 合并dev代码 5 years ago
钮海涛 94568777fb 合并test代码 5 years ago
钮海涛 9c7d455998 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 61ad20717b 合并sweb代码 5 years ago
曾贞一 944b853862 【代码优化】 5 years ago
曾贞一 84d5f84457 【11629 20021--北美看板需求变更--0930】 5 years ago
puxiao.liao 79baaa4546 Fix bug#11661 
移库单界面增加来源存储区和目标库位的检索条件
 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
汪云昊 56bd07dbf3 Merge remote-tracking branch 'origin/dev' into test 5 years ago
puxiao.liao f591139bed 修复TJ MGN BUG 5 years ago
rock.yu 14d2af59d6 增加多级BOM生效功能 5 years ago
许心洁 a939c689f3 任务#2814 5 years ago
rock.yu 605b7e846a 增加虚零件属性 5 years ago
曾贞一 4bd47e64c3 【接口映射-添加字段接口名称】 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
曾贞一 2f717fdd98 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2d2ff0ddb1 【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】 5 years ago
puxiao.liao 4bfb903e54 修复麦格那发运提交事务重复&盘点提交sql异常 5 years ago
rock.yu 11750e9bf1 修改库存快照的pojo，确保快照功能可以正常执行 5 years ago
puxiao.liao fc351f5599 修复TJ MGN BUG 5 years ago
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