许心洁
|
75be7d5078
|
任务#1744：全局替换自定义搜索功能
|
6 years ago |
|
许心洁
|
ef6330675c
|
任务#1744：全局替换自定义搜索功能
|
6 years ago |
 钮海涛
|
f87eeeb491
|
修复合并版本问题
|
6 years ago |
|
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
917a101f20
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
df2e8601c4
|
task:1719
|
6 years ago |
puxiao.liao
|
ba81a26700
|
1778 产品工装关系维护
|
6 years ago |
 曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
6 years ago |
|
puxiao.liao
|
1983602b3a
|
8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询，查询出来的零件数量全部为0
|
6 years ago |
|
钮海涛
|
bbe03cc6fd
|
解决合并冲突问题
|
6 years ago |
|
钮海涛
|
40a87d83b3
|
修复合并问题
|
6 years ago |
|
钮海涛
|
05276bcf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
6 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
6 years ago |
|
钮海涛
|
2b85a05645
|
新增脚本WebSocket
|
6 years ago |
|
钮海涛
|
dd70688754
|
新增脚本WebSocket
|
6 years ago |
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
6 years ago |
|
钮海涛
|
6e2344b303
|
bug:8330
|
6 years ago |
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
97d7fdbf24
|
【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】
|
6 years ago |
|
曾贞一
|
fb15536a34
|
【8254 中航-出库单-客户发运-新增销售订单字段】
|
6 years ago |
|
钮海涛
|
7aaed8fb79
|
task:1735
|
6 years ago |
|
钮海涛
|
bf2cc9843f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
6 years ago |
|
钮海涛
|
81f380aec4
|
产品入库表新增
|
6 years ago |
|
钮海涛
|
b7dceccd71
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
钮海涛
|
f414274aeb
|
供货追踪
|
6 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
1a7d9edd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
3cd2fb02f4
|
宁德BUG-JIS发运汇总JOB:BUG#8246
|
6 years ago |
|
曾贞一
|
8e529f46d7
|
【1722 BH-Bacth条码查询】
|
6 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
6 years ago |
|
wei.peng
|
8aab106aa9
|
合并代码 pom 冲突
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
|
6 years ago |
|
钮海涛
|
724ba402bf
|
前端联调
|
6 years ago |
|
曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
6 years ago |
|
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
6 years ago |
|
钮海涛
|
3fbf532c84
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
6 years ago |
|
曾贞一
|
c3b6376934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
f3e53ff1eb
|
【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
|
6 years ago |
|
钮海涛
|
7b2a4fdea7
|
合并dev代码
|
6 years ago |
|
钮海涛
|
475bb9370f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
qianhs
|
2303186fc4
|
【657】【中航WMS看板－成品发运率看板】
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
|
6 years ago |
|
钮海涛
|
398207b875
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
曾贞一
|
6190a4f66d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
156f0feedc
|
【1603 委外扣减查询】
|
6 years ago |
|
puxiao.liao
|
7c7691f583
|
bug8190【8190 中航-成品条码维护-批量修改客户代码-】
|
6 years ago |
|
钮海涛
|
4d383dda1b
|
新增事务报工查询
|
6 years ago |
|
puxiao.liao
|
f6988f36c8
|
1655 生产领料单增加替代料
|
6 years ago |
袁津哲
|
7789883f9b
|
开发导入功能模块
|
6 years ago |
|
曾贞一
|
509240126a
|
【1604 待入库数据查询】
|
6 years ago |
|
曾贞一
|
312cf59f49
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
88ce1e59cf
|
【1604 待入库数据查询】
|
6 years ago |
|
袁津哲
|
8a6c9aadef
|
开发导入功能模块
|
6 years ago |
|
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
e417e761c7
|
bug8124【8124 物料拆分-输入数量-系统异常】
|
6 years ago |
|
袁津哲
|
9518628c12
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
533d8e55e8
|
开发导入模块功能
|
6 years ago |
|
钮海涛
|
eb85cc232f
|
task:1623
|
6 years ago |
|
袁津哲
|
36b4e67020
|
导入模板功能建模
|
6 years ago |
|
袁津哲
|
ec1d8a2ff3
|
开发导入模板功能
|
6 years ago |
|
钮海涛
|
b25ff3cbba
|
bug:8137
|
6 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
6 years ago |
|
钮海涛
|
100d8b0019
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
c75a25b854
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
bd810c1c8c
|
task:1591
|
6 years ago |
|
qianhs
|
88279f9b8b
|
sonar bug修改
|
6 years ago |
|
曾贞一
|
e5c275499c
|
【冲突解决】
|
6 years ago |
|
曾贞一
|
255aefbcef
|
【1585 销售订单管理-销售订单维护】
|
6 years ago |
|
钮海涛
|
e64134a821
|
修复合并问题
|
6 years ago |
|
钮海涛
|
e9ec4cecfe
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
00fce0bded
|
新增客户物料发往地
|
6 years ago |
|
puxiao.liao
|
a2f7c3426e
|
bug7994【7994 麦格纳收货需求差异】
|
6 years ago |
|
钮海涛
|
01d3eeea51
|
新增客户物料发往地
|
6 years ago |
|
钮海涛
|
16f6861ecd
|
新增窗口时间
|
6 years ago |
|
钮海涛
|
331fb73d28
|
新增供应商维护基础数据
|
6 years ago |
|
袁津哲
|
30610476b9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
1caea6bf36
|
修改实体数字字段
|
6 years ago |
|
qianhs
|
214fbb8da2
|
【1613 装车单新增中航打印格式】
|
6 years ago |
|
袁津哲
|
db7d86acc1
|
修改实体数字字段默认值0，不允许为空
|
6 years ago |
|
袁津哲
|
a5a8130388
|
修改不兼容sqlserver数据库查询语句
|
6 years ago |
 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
6 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
6 years ago |
|
袁津哲
|
1a74363541
|
优化实体字段
|
6 years ago |
|
puxiao.liao
|
4b3923a64d
|
bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】
|
6 years ago |
|
钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
01ae9caa8c
|
task:1496
|
6 years ago |
|
puxiao.liao
|
63c827d0de
|
bug8050【8050 运输规则配置页面--新增成功，数据库有数据，但是页面不显示】
|
6 years ago |
|
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
b7e3aeef41
|
【8014 20011--报工记录表，查询数据重复---0415】
【8015 20011--报工记录报表，增加两列显示】
|
6 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
6 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
4884f59072
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
2bc62e2444
|
动态查询：#需求变更 创建用户和更新用户也需要做成可选的
|
6 years ago |
|
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
6 years ago |
|
汪云昊
|
2772ea6a2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
6 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
6 years ago |
|
puxiao.liao
|
b8701bc398
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
puxiao.liao
|
7062e7a383
|
bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】
|
6 years ago |
|
曾贞一
|
46e0f502d0
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
6 years ago |
|
曾贞一
|
a59a5e532e
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
6 years ago |
|
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
6 years ago |
|
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
6 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
6 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
6 years ago |
|
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
6 years ago |
|
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
6 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
6 years ago |
|
钮海涛
|
8c4cb0748b
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
6 years ago |
|
钮海涛
|
c3a5564652
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
|
钮海涛
|
6925ce3b18
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
|
袁津哲
|
a8d84b1043
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
5de3c0bd7b
|
移库单模型中添加创建时间字段
|
6 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
6 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
6 years ago |
|
袁津哲
|
a4d32d6612
|
开发波次计划根据规则生成计划功能
|
6 years ago |
|
袁津哲
|
cb8a090aea
|
开发波次计划功能
|
6 years ago |
|
袁津哲
|
ffbd512b89
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
14cfa5fa47
|
创建波次计划规则实体类和规则明细实体类
|
6 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
6 years ago |
|
wynne1005
|
3c08e7794f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
贾文涛
|
eed24e0297
|
统一修改pom文件的项目版本问题
|
6 years ago |
|
puxiao.liao
|
a887aa1236
|
1454 基于责任区域和班次的任务推送
|
6 years ago |
|
wynne1005
|
286d605f09
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
6 years ago |
|
puxiao.liao
|
bf427bbb31
|
bug7918【7918 条码操作记录表在更新后，缺少一行关联二维码字段，（更新后出现的问题）】
|
6 years ago |
|
钮海涛
|
d8779f42fb
|
从dev拉取最新代码
|
6 years ago |
廖普小
|
eb1c89e5e6
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
贾文涛
|
abf5d3eeb9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
|
puxiao.liao
|
b626989e63
|
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
|
6 years ago |
|
puxiao.liao
|
3a7d7a7924
|
bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口，当接收到数据时，需要在系统中生成一个标签，然后自动对该标签进行报工操作，接口中包含了条码，零件信息。】
|
6 years ago |
|
曾贞一
|
58053f4972
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
56c1bf8c44
|
【7648 在发运界面增加一个打开单据按钮。】
|
6 years ago |
|
钮海涛
|
cf0db5b8da
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
a22d3d2333
|
动态查询：#任务1352(合并代码解决冲突)
|
6 years ago |
|
许心洁
|
030f2948fb
|
动态查询：#任务1352
|
6 years ago |
|
王杰
|
a9a7d78bd5
|
解决冲突
|
6 years ago |
|
袁津哲
|
f3b7ae8bc5
|
优化WmsPDA插件实体，去掉本地文件夹维护
|
6 years ago |
|
袁津哲
|
ab794aab0b
|
开发WMS动态加载插件功能
|
6 years ago |
|
袁津哲
|
2a0204ad99
|
开发WMS动态加载插件功能
|
6 years ago |
|
曾贞一
|
99ecde38d2
|
【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】
|
6 years ago |
|
曾贞一
|
10b5885ede
|
【7874 盘点主表中这两个字段由于后台取值错误，导致界面上无显示，需要修改,目前的逻辑看第二个字段中取值为库区，需要取库区所对应的库存地】
|
6 years ago |
|
puxiao.liao
|
4c199ce8ba
|
任务1470【 1470 504 北京麦格纳-采购收货--新增扫描二维码组件】
任务1467【1467 506 北京麦格纳-推荐入库-新增推荐动态库位组件】
|
6 years ago |
|
曾贞一
|
3d913456af
|
【7863 修改单据两步法操作后，单据条码明细直接变为已完成的问题】
|
6 years ago |
|
许心洁
|
8178e90abd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
5bf7133ff1
|
动态查询：BUG#7845；BUG#7676；BUG#7675
|
6 years ago |
|
袁津哲
|
df21c218cd
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
b08d20fdb6
|
开发WMS动态加载插件功能
|
6 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
6 years ago |
|
袁津哲
|
c178540545
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
袁津哲
|
327af15040
|
开发WMS动态加载插件功能
|
6 years ago |
|
钮海涛
|
1eaacd1b28
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
333ef54c80
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
puxiao.liao
|
8a7c5fa1b5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
e3b6f03dd8
|
北京麦格纳WMS#511【511 北京麦格纳-NC报废NC冻结-自动不良品标签打印】
北京麦格纳WMS#510【510 北京麦格纳-拣货-领料任务监控看板】
北京麦格纳WMS#508【508 北京麦格纳-拣货-根据最短路径推荐条码】
北京麦格纳WMS#507【507 北京麦格纳-计划外入库（零星入库）新增，默认批次为生产日期】
北京麦格纳WMS#505【505 北京麦格纳-采购收货-推送收货差异邮件】
北京麦格纳WMS#509【509 北京麦格纳-过期品自动报警】
|
6 years ago |
|
puxiao.liao
|
2da53135a8
|
bug7761【7761 发运配料界面，执行成功与无库存未做国际化，翻译资源已配置好】
bug【7766 拆分打印功能操作完成后下方需要回显，拆分出的条码的零件号，条码，数量，库位。】
|
6 years ago |
|
许心洁
|
313a0acfb8
|
test
|
6 years ago |
|
许心洁
|
5b92cae5d1
|
3D仓库：联调优化+收货看板BUG#7308
|
6 years ago |
|
puxiao.liao
|
9edfe18aec
|
【7565 收货分组功能要求。】bug7565
|
6 years ago |
|
puxiao.liao
|
9ca00bee68
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
|
puxiao.liao
|
8f584f250b
|
【7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
】bug7633
|
6 years ago |
|
puxiao.liao
|
be479c2e76
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
8a98efa9a6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
eaed7962ab
|
动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+
3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）
|
6 years ago |
|
曾贞一
|
38f1bd3b01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
c0ce05e07c
|
【7648 在发运界面增加一个打开单据按钮】
|
6 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
6 years ago |
|
puxiao.liao
|
4c0b2a1961
|
【 7603 单个零件标签打印功能修改。
】bug7603
|
6 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
6 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
6 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
6 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
6 years ago |
|
曾贞一
|
0368152e71
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
许心洁
|
d815ca9b12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
2c0ef55e85
|
解决动态查询BUG#7674,#7676+
流程导入BUG#7682
|
6 years ago |
|
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
61d3be19cb
|
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/bean/WmsDocMovementSn.java
|
6 years ago |
|
puxiao.liao
|
0968cdc49e
|
【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601
【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567
【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520
|
6 years ago |
|
曾贞一
|
eefb472117
|
【7650 客户标签扫描】
|
6 years ago |
|
曾贞一
|
5cc5844e45
|
【库存条码实体-添加字段 包装零件号】
|
6 years ago |
|
许心洁
|
3d3f134d7f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c9f6f336af
|
动态查询：解决了BUG#7658,7660,7661,7663,7664
3D仓库：联调优化逻辑
|
6 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
钮海涛
|
b323b2feae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
puxiao.liao
|
50d3de9b77
|
7600 二维码零件标签打印功能修改。
7565 收货分组功能要求。
7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
7628 库存调整盘点时，扫描库位后的提示增加一个库位
7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示
7536 没库存时领料与发运的提示修改为下列
7659 创建盘点单冻结条码时条码is_vaild=2
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
7652 在条码状态报表中增加组号字段显示，查询框也需要增加
7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。
7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号
7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
|
6 years ago |
|
许心洁
|
1e0d88fb0e
|
动态查询：开窗和时间查询优化+3D仓库基础数据校验优化
|
6 years ago |
|
许心洁
|
df03827264
|
动态查询：注解enumName属性名称改为entityName
|
6 years ago |
|
许心洁
|
a49b747c18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
cc98e84ba4
|
动态查询：增加开窗功能
|
6 years ago |
|
钮海涛
|
85dff1fde9
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
qianhs
|
83ed87a769
|
【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】
|
6 years ago |
|
曾贞一
|
767a9b98cd
|
【7568 PDA收货界面增加一个搜索框，让员工可以选择ASN单据收货】
|
6 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
0a433f1ecf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
453226d6ec
|
【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码--修改按所有时间都可以查询出来】
|
6 years ago |
|
许心洁
|
b8d7feb413
|
动态查询：添加固定查询条件：isValid，isDeleted + 给WmsLocate,WmsBom,WmsZones,WareHouse实体添加动态查询注解
+
字段无需区分工厂
|
6 years ago |
|
许心洁
|
fc778833b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
1aec8a2f5f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
a620828956
|
【7555 需要在条码状态报表中可以搜索保质期时间，查询在选中区间内过期的条码】
|
6 years ago |
|
qianhs
|
d3c30fa9be
|
【 盘点时，能否盘点待质检的条码，欧洲方面不需要对质检条码进行卡控】【bug7542】
|
6 years ago |
|
luweihao
|
246dd85721
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
658885ade5
|
合并冲突
|
6 years ago |
|
陈思洁
|
1e431aef58
|
【1418 新增固化看板】
|
6 years ago |
|
许心洁
|
55e3f212ce
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7f161e3bae
|
3D可视化仓库
|
6 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
91b43823c9
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
b56d9cb824
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
c40d3360d3
|
【1416 新增固化时间维护】
|
6 years ago |
|
jenkins
|
9f0a0852e7
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
709db0b573
|
【 7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。
】bug7526
|
6 years ago |
|
jenkins
|
1ee4a53d64
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
37ee72adaf
|
【 7523 条码拆箱功能输入数量时，此处提示改为“扫描成功，请输入新条码数量”
】bug7523
|
6 years ago |
|
jenkins
|
9fc85191fe
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
759fda55b9
|
【 7527 1.推荐入库（推荐生产入库），如果扫描加密码错，报错有问题，2.如果扫描库位时，检查条码某项条件不符合入库规范则需要回到请扫描条码那一步。
】bug7527
|
6 years ago |
|
jenkins
|
ec0b3528f4
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
243c38793b
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
0961a7ce14
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
9fe977e8c0
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
106703a2be
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
8477526bf5
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
6a91ce5c50
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
8a9c8273d8
|
【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】
|
6 years ago |
|
jenkins
|
594577cc69
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
901623b254
|
【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。
】bug7510
|
6 years ago |
|
jenkins
|
218899aae9
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
f9cb6be454
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
puxiao.liao
|
54b167256f
|
【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。
】bug7510
|
6 years ago |
|
jenkins
|
f8fa1cd957
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
9c754e5816
|
【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】
|
6 years ago |
|
jenkins
|
26fd59e5c7
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
96e0e3756f
|
【 7507 发运单接收接口新增字段
】bug7507
|
6 years ago |
|
jenkins
|
24d834cd6d
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
e1114d67d2
|
【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】
|
6 years ago |
|
jenkins
|
7c422cad79
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
591f865bf3
|
【成品打印需要带出客户零件号，先用单据所属的客户发往地+零件号去WMS_CUSTOMER_PART表中找客户零件号，如果找不到再用客户+零件号去找。】【bug7501】
|
6 years ago |
|
jenkins
|
8c5020b098
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
44648e4218
|
【1396 亚太-领料任务明细看板】
|
6 years ago |
|
王杰
|
01e896a752
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
60ab897195
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
e14e813230
|
【7476 发运的新老标签对应报表】
|
6 years ago |
|
jenkins
|
27b1f5ca21
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
22eaa30dab
|
【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】
|
6 years ago |
|
jenkins
|
1ae61084c5
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
415ae5a45b
|
【7457 1.发运时，如果是两步发运，客户标签打印后，在做第二步发运出库时，需要扫描已经绑定的客户标签。】
|
6 years ago |
|
jenkins
|
6e545a7ec1
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
db6522fba3
|
优化动态搜索与自定义列表代码
|
6 years ago |
|
jenkins
|
c90df4e96a
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
28ce8615fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
51d60a107a
|
SAP指令锁定逻辑修改：
根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；
原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；
|
6 years ago |
|
jenkins
|
7e6f83a974
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
babc158ed6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
5feae0dd1a
|
【1405 物流路线在物品分类及仓库级别的应用】
|
6 years ago |
|
陈思洁
|
09339a6e1f
|
【1405 物流路线在物品分类及仓库级别的应用】
|
6 years ago |
|
jenkins
|
d790bcf355
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
89a7cafee4
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
6371e8df60
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
f7c98e3982
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
a19cace3b1
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
86b73d43f9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
6f82fa17fd
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
889c6ac548
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
7f7c9ebf6e
|
SAP指令锁定组件逻辑修改：若根据单据号查询到了记录则不再新增了，并且调用此组件时缓存中一定得存在ORDER_NO;
定时重推待处理移动单入JOB容错结构修改+留个SWAGGER接口
|
6 years ago |
|
qianhs
|
a1ec8d7293
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
puxiao.liao
|
347197f305
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
b64327831a
|
【 7402 收货回执界面，查询条件增加一个ASN组号，显示列表中也增加一个ASN组号
】bug7402
|
6 years ago |
|
jenkins
|
69ff58a67e
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
61303a9f38
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
jenkins
|
458137d216
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
c2ba0a5663
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
e967001c75
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
cb7f868d64
|
任务#1403 流程isCommitRefMove属性改为commitMode
|
6 years ago |
|
袁津哲
|
ad8e51dfae
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
c1609539cf
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
de0d57179c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
35839db806
|
BUG#7359 任务列表分组字段和移动单赋值逻辑更改
|
6 years ago |
|
jenkins
|
006fd3aef3
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
3a9e719005
|
【vda收货时，是否分组提交】
|
6 years ago |
|
jenkins
|
274011537c
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
f1afdf92e9
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
jenkins
|
24f9ed25c2
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
9d744318cd
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
jenkins
|
a0b67a3723
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
8285c87624
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
16a414192f
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
c543043da5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
328f2e64c5
|
【同批次修改】
|
6 years ago |
|
qianhs
|
2eb14492d4
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
jenkins
|
7057c685cc
|
Jenkins自动合并
|
6 years ago |
E
|
c7a2c79f26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
8e168c5109
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
ff4cd68e89
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
c2e66de638
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
袁津哲
|
86694d3ceb
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
e88b93a22c
|
Jenkins自动合并
|
6 years ago |
gcj
|
8245950fd3
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
gcj
|
51c66e9279
|
【宁德问题清单】
|
6 years ago |
|
jenkins
|
8d614aef8d
|
Jenkins自动合并
|
6 years ago |
|
陈思洁
|
1e0a0ff4fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
c24de431d4
|
【6853 数据迁移：产品报工明细表、产品发运表、产品入库表。定期迁移。】
|
6 years ago |
|
曾贞一
|
c3ad3d260a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
3d7f88d2ee
|
【7201 收货BOP移库流程图】
|
6 years ago |
|
gcj
|
8414af2011
|
【按规则推送邮件】
|
6 years ago |
|
gcj
|
890b094e15
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
7090f30b94
|
【按规则推送邮件】
|
6 years ago |
|
jenkins
|
56e53906ec
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
241350ae83
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
E
|
0cc70fe2d0
|
【#1390 基础数据-客户信息增加导入功能】
|
6 years ago |
|
jenkins
|
3db9a86504
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
fc19275ef0
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
4e0f40042a
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
陈思洁
|
b0065bd650
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
fa576d7a6d
|
【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】
|
6 years ago |
|
jenkins
|
fe71007a5c
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
42bbb852c4
|
Wms初始化扫描实体字段新增逻辑优化
|
6 years ago |
|
汪云昊
|
536200cf2b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
袁津哲
|
2f2f24356c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
daf3365ce3
|
Wms初始化扫描实体字段新增逻辑优化
|
6 years ago |
|
gcj
|
cbe87c6bd7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
c14d6c6916
|
【宁德问题清单】
|
6 years ago |
|
袁津哲
|
e5138ac4e9
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
e1386275d0
|
Wms初始化扫描实体字段新增逻辑优化
|
6 years ago |
|
陈思洁
|
99f79ee5db
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
25606ea25a
|
【6847 开发执行异常的预警报表。存在处理异常数据时，提供报表展示。盘点前所有异常数据均需处理完成】
|
6 years ago |
|
袁津哲
|
29f785ed35
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
袁津哲
|
7d4ba10449
|
Wms初始化扫描实体字段新增逻辑优化
|
6 years ago |
|
jenkins
|
ae8475de5d
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
2f90982e68
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c53c8c04e3
|
BUG#7186
|
6 years ago |
|
jenkins
|
b0bbf43a9b
|
Jenkins自动合并
|
6 years ago |
宋军超
|
b0f60a9176
|
2020-01-08创建动态列表与查询model
|
6 years ago |
|
jenkins
|
75dc17f4c4
|
Jenkins自动合并
|
6 years ago |
e-jiawentao1
|
7b696d7e73
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
e-jiawentao1
|
a92090a3ab
|
2020-01-07创建动态查询与表单各层
|
6 years ago |
e-jiawentao1
|
c51453a856
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
e-jiawentao1
|
9fbc120666
|
动态搜索与自定义列表初始化扫描Bean字段
|
6 years ago |
|
jenkins
|
189bece3f7
|
Jenkins自动合并
|
6 years ago |
|
e-jiawentao1
|
b2edab4ef4
|
2020-01-07创建动态查询与表单dao
|
6 years ago |
|
e-jiawentao1
|
1dba90f768
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
e-jiawentao1
|
b939ce6625
|
2020-01-07创建动态查询实体
|
6 years ago |
|
王杰
|
685d7949bf
|
Merge branch 'dev' into test
|
6 years ago |