2571 Commits (e5584f82a2fd92abcf2c9409fa3f01e3b2396c0e)
 

Author SHA1 Message Date
陈思洁 1514f9434e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 623d17a2ec 字段默认值赋值 6 years ago
刘敏 73c474ee9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 b941354087 盘点导入默认值 6 years ago
wei.peng fea0d476a4 基础操作,数据补全 6 years ago
wei.peng 2a587524ff 基础操作,数据补全 6 years ago
陈思洁 0e15934d16 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 6a3662283b 枚举修改赋值 6 years ago
汪云昊 0ed90485a6 安灯基础数据导入导出 6 years ago
于学杰 f4673fd984 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
于学杰 dbbb4f3cb9 Merge branch 'dev' into test 6 years ago
于学杰 6ba7a43ea7 Merge branch 'dev' 6 years ago
于学杰 4350a82043 1. 完善脚本引擎 6 years ago
于学杰 738276a1fa 1 revert pom 6 years ago
于学杰 ca658628c8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
#	pom.xml
6 years ago
于学杰 c1d06d15c8 Merge branch 'dev'
# Conflicts:
#	pom.xml
6 years ago
刘敏 72ac1f39f4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 d75570c987 库存报表问题修改 6 years ago
于学杰 5dc8cd5bda Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 02044789dc 1. TO ERP 增加单据行号字段
2. 脚本引擎 & 规则引擎 增加工厂代码
6 years ago
陈思洁 f26cdda8ec 实体新增字段 6 years ago
Chnx eb4914ae7a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Chnx 9c189dce3c 库存移动单查询接口 6 years ago
wei.peng 353b8a37c5 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
wei.peng 6c57b8e10c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng 2aa2dca77f 用户权限调整 6 years ago
wei.peng e1824dbba4 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 70fc1618a3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng be78ed2636 用户权限调整 帐号管理权限完成 6 years ago
wei.peng c858475bd2 用户权限调整 部门权限调整完成 6 years ago
peter.pan 24f7ae3471 Merge branch 'test' 6 years ago
wei.peng 3a19888ddf 用户权限调整 岗位功能调整完成 6 years ago
peter.pan 53d34096f7 Merge branch 'dev' into test 6 years ago
刘敏 a95b1c9623 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 cf7957525a 盘点指令默认值赋值 6 years ago
汪云昊 8e39e6d9fb Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 8a5a7c23ca andonPLC MQ 推送配置 6 years ago
汪云昊 0041ce328e 定时删除日志 6 years ago
wei.peng 78cd5dc77e 用户权限调整 6 years ago
刘敏 6861d44a1c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 a1a77b63db 下线结算标识、是否录入生产批次。
POJO默认赋值2
6 years ago
peter.pan d9ef2677fb Merge branch 'dev' into test 6 years ago
shiyanghuan b2866c85dd bug修改 6 years ago
peter.pan f4613c2f5c Merge branch 'test' 6 years ago
wei.peng 1b1bc67c90 用户权限调整 6 years ago
wei.peng 0ca528bade 用户权限调整 6 years ago
peter.pan 61ecc2a74f Merge branch 'dev' into test 6 years ago
陈思洁 fba99de795 枚举修改 6 years ago
陈思洁 d47c9f8650 合并冲突pojo 6 years ago
陈思洁 f0e0867e2c 库存移动pojo新增字段 6 years ago