152 Commits (fb1756198d570166cfd9b3d60ec457cd008bfb8d)

Author SHA1 Message Date
jessica.chen fb1756198d 更改模块 7 years ago
amy 8ab93eb53a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 40b536aa8e 初始化修改 7 years ago
柯裕 bd282d875f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy b81e502101 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 2995a1e057 修改查询条件 7 years ago
柯裕 0cc642f9b6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter 0c7eac9025 单元测试开发工具类新增 7 years ago
amy c82ba74e9e Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 88429e342e 枚举修改 7 years ago
柯裕 19c635e8b2 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 675e3abb6f Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 eb2ac7a408 修改查询条件 7 years ago
jimmy b4735f3469 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
7 years ago
jimmy 611fb5b601 修改有效性等等 7 years ago
Silliter 3c32f511a7 单元测试开发工具类新增 7 years ago
gragon.xu e6775e65f6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 9189ca1bbd 前端调整 7 years ago
jessica.chen 15f1df839b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 c66edabb7f 修改查询条件 7 years ago
jessica.chen aa23a3973f 修改抽点记录信息和产品发运信息 7 years ago
amy 90dda577fb Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy d4929181c7 删除标识枚举更改 7 years ago
gragon.xu 7cd7712912 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
#	modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java
7 years ago
gragon.xu 766318f1dc Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu d4fa40ed79 controller&service合并 7 years ago
jimmy 014a296bcd 移动抽点比例信息 7 years ago
jessica.chen 92f58a0162 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen 538ecf84c3 修改拼接 7 years ago
gragon.xu 762d7d4cc0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu db8e869674 测试 7 years ago
jimmy cf32b4c92a 修改PO订单明细表sql 7 years ago
柯裕 5914c4e746 产品入库模块和作业任务模块 7 years ago
jessica.chen bf6c51b3aa Merge remote-tracking branch 'origin/master' 7 years ago
jessica.chen 6fe3f2a1ff 增加抽点记录信息 7 years ago
amy 477f6c5ff1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 22d5ba1c0f 字段修改 7 years ago
jessica.chen 8a55b01825 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 37008febab 查询条件添加 7 years ago
jessica.chen 72407a5afc 更改产品发运信息 7 years ago
gragon.xu 87048b4e42 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 73c5e20c01 移库单主表,移库单详情表 7 years ago
jimmy b9db3d0076 开发po订单主表、明细表 7 years ago
jimmy 6fc6519382 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy 92d74bee7b 开发po订单主表 7 years ago
gragon.xu d0b8f1649d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 41edf3f731 添加工厂代码作为查询条件;添加批量软删除方法 7 years ago
amy 1ef429fc78 添加组织代码查询条件 7 years ago
amy ae61fad0d5 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 0bacd88012 修改类名 7 years ago