1984 Commits (7b83985f402bc26971312ef3e77224559dce22ca)
 

Author SHA1 Message Date
许心洁 7b83985f40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 f6bf244b12 流程管家放MOVENO的BUG 6 years ago
陈思洁 5f5bd84089 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 8e8cafc6d8 数据权限增加角色名称
库存条码数量封装
6 years ago
刘敏 9b2356231e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 4a5f799291 实体新增 6 years ago
刘敏 8a420ff9c9 库存转储指令 供应商退货指令实体新增 6 years ago
汪云昊 f4fe91ace0 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 6259bd56bc 通用EXCEl导出MODEL 6 years ago
sky.meng 15c22e28fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 0182dd3cc3 生产线(工作中心) 存储区关系管理功能完成 6 years ago
shiyanghuan f7f0ebadaf Merge branch 'dev' of http://git.estsh.com/i3-WMS/i3plus-wms into dev
# Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsUnitController.java
6 years ago
刘敏 81f0ea48ba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 02734d33f9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 b6746b7e6f 1. 增加 WMS 到 SAP 接口的处理代码 6 years ago
刘敏 0a7583a91b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 85681c4465 导入问题统一修改 6 years ago
陈思洁 0210ab9d70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 16ceb8ff7b 修复任务权限业务逻辑 6 years ago
曾贞一 8f56fc5620 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 fa59716c17 需求变更 冻结盘点业务 6 years ago
shiyanghuan 6222923c80 修改 6 years ago
刘敏 3310571d18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 856345e830 初始化问题修改 6 years ago
许心洁 c4bdbc3c17 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 7fa871508e 流程修改去掉工厂代码+库存交易实体新增scrapQty字段 6 years ago
刘敏 8dc939b849 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 07e6e58e23 实体新增与修改 6 years ago
陈思洁 e85c2ea992 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 91999948b6 sql优化 6 years ago
刘敏 e726833580 非JIS发运实体新增 6 years ago
许心洁 ada53de0fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 f69795cc5f 任务数据来源基础数据维护唯一校验修改 6 years ago
sky.meng baee01a070 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 5f898661c7 添加产线(工作中心)-存储区信息 repository 6 years ago
曾贞一 8d64152e58 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
6 years ago
曾贞一 8289de8259 优化 新建盘点范围数据
需求更新 盘点冻结业务
6 years ago
shiyanghuan 619487aedb 修改库位物料和供应商物料bug 6 years ago
shiyanghuan f7d4f85d45 库位物料和供应商物料bug修复 6 years ago
刘敏 721ddbee3c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 16400aa31c 实体字段修改 6 years ago
sky.meng e5e0da62e7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
sky.meng 939d67e7f3 添加产线信息管理(工作中心) 6 years ago
许心洁 dfef27151d 冲突 6 years ago
许心洁 f834e91353 Task#764+枚举TRUE_OR_FALSE 6 years ago
陈思洁 f89a98479c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 30dd11cce7 sql拼接优化 6 years ago
peter.pan 62b2ea298b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java
6 years ago
peter.pan ea83820fbf 新增物料类型跟单位类型 6 years ago
许心洁 b3272dc3d7 冲突 6 years ago