287 Commits (ac84f62e702ad42ca50476051ef781500aba4b8f)

Author SHA1 Message Date
Silliter ac84f62e70 解决冲突 7 years ago
柯裕 e3a8fb7b12 修改字段 7 years ago
Silliter d2847f60ba Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter cb395f077e 解决冲突 7 years ago
jessica.chen b43ffb6fc3 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen 69f4a95394 实体类已收数量添加 7 years ago
Silliter 61b16569a4 解决冲突 7 years ago
Silliter e1d0e75c74 解决冲突 7 years ago
Silliter 8e6bc17a45 解决冲突 7 years ago
jessica.chen b2e4c2496a 解决冲突 7 years ago
gragon.xu 7a8baf42d7 冲突 7 years ago
gragon.xu cd777e00a5 流程管家create 7 years ago
Silliter 506f13d4b2 解决冲突 7 years ago
Silliter e1c02277b3 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter bfc1d5ba2b 解决冲突 7 years ago
amy d2a3f4a9bf 返回实体代码字段添加 7 years ago
amy 4d8148ea9d 返回实体构造添加 7 years ago
Silliter fd83bef49b 解决冲突 7 years ago
Silliter b77406b1e0 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms
# Conflicts:
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/components/ScanOrderNoService.java
7 years ago
Silliter 0dbb07ea9d Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
Silliter b0d191ceaa 解决冲突 7 years ago
柯裕 4337055898 PO条码表 7 years ago
Silliter 43ed6deb6c 解决冲突 7 years ago
Silliter 95826a1846 优化代码逻辑 7 years ago
jessica.chen 83de8099bc 作业参数 7 years ago
jessica.chen 8553764df1 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jessica.chen fce89348c7 作业参数 7 years ago
amy c9dd7ba3cb 参数类型枚举添加 7 years ago
amy 1deba1c026 实体id序列化 7 years ago
amy 6178a4ce87 联合查询字段添加 7 years ago
柯裕 64c42217d4 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
柯裕 15aae342ee 作业记录明细字段完善 7 years ago
gragon.xu 7978b37bd4 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 0a0bafca8c 作业步骤组件;参数测试;修改组件参数的amID加上防止前端接收long型参数精数丢失; 7 years ago
jimmy ba154986ea Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
jimmy efa5da8667 开发作业步骤调用 7 years ago
jessica.chen ae7c00576a 作业参数添加枚举状态 7 years ago
amy fa54afe122 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
amy 0c568f2107 添加查询条件 7 years ago
柯裕 7035bdd80c 作业记录,作业记录明细 7 years ago
jimmy 4ca1d70e0c 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 911e93429e 修改抽点比例查询条件 7 years ago
jessica.chen fce4518982 解决冲突 7 years ago
jessica.chen 4b410c1408 新增作业步骤调用参数信息和作业记录参数信息 7 years ago
amy 0fe5c32fdc Merge remote-tracking branch 'origin/master' 7 years ago
amy 103a27c36e 作业流程与明细开发 7 years ago
Silliter f99d4e4dc6 修改测试环境数据库编码 7 years ago
amy 7b71b349a7 修改 7 years ago
amy 805545574a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago
gragon.xu 205b4701aa Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 7 years ago