许心洁
|
7e4fe5f945
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
许心洁
|
5d9f37ee33
|
根据作业类型分组查询流程组件SQL :兼容SQLserver数据库优化
|
5 years ago |
钮海涛
|
34a3598508
|
bug:8385
|
5 years ago |
王杰
|
de9017ca5c
|
冲突
|
5 years ago |
王杰
|
eaecf4b4b7
|
pom
|
5 years ago |
王杰
|
c68d49880c
|
Merge branch 'dev' into test
|
5 years ago |
王杰
|
7d192b36a6
|
pom冲突
|
5 years ago |
袁津哲
|
80e572f07d
|
开发回显组件模板管理功能和优化实体生成数据库脚本逻辑
|
5 years ago |
puxiao.liao
|
a748fbd2f7
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
puxiao.liao
|
f765493696
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
|
5 years ago |
puxiao.liao
|
70aeae21d3
|
8426 中航-报表中心-采购计划更改查询-查询条件无效
|
5 years ago |
曾贞一
|
d43935f88a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
7ac98ffbc6
|
【1797 天津麦格纳WMS-定制业务-VDA标签防错验证】
|
5 years ago |
钮海涛
|
da8b4db890
|
修复pom版本问题
|
5 years ago |
许心洁
|
75be7d5078
|
任务#1744:全局替换自定义搜索功能
|
5 years ago |
许心洁
|
ef6330675c
|
任务#1744:全局替换自定义搜索功能
|
5 years ago |
钮海涛
|
f87eeeb491
|
修复合并版本问题
|
5 years ago |
钮海涛
|
ac268c1cbc
|
Merge branch 'test' into dev
|
5 years ago |
钮海涛
|
917a101f20
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
钮海涛
|
df2e8601c4
|
task:1719
|
5 years ago |
puxiao.liao
|
ba81a26700
|
1778 产品工装关系维护
|
5 years ago |
曾贞一
|
1901cf6eb0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
2dac15c248
|
【1709 BH-录入检测值】
|
5 years ago |
puxiao.liao
|
1983602b3a
|
8060 AP-MGN-BJ-19081 --扫描查询输入零件号查询,查询出来的零件数量全部为0
|
5 years ago |
钮海涛
|
bbe03cc6fd
|
解决合并冲突问题
|
5 years ago |
钮海涛
|
40a87d83b3
|
修复合并问题
|
5 years ago |
钮海涛
|
05276bcf46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
5 years ago |
钮海涛
|
2b85a05645
|
新增脚本WebSocket
|
5 years ago |
钮海涛
|
dd70688754
|
新增脚本WebSocket
|
5 years ago |
qianhs
|
f03e119561
|
bug:8268;8267;8266;8265
|
5 years ago |
钮海涛
|
6e2344b303
|
bug:8330
|
5 years ago |
wynne1005
|
4ed1770189
|
Merge branch 'dev' into test
|
5 years ago |
曾贞一
|
97d7fdbf24
|
【8181 20011-- 条码打印界面增加一个打印组号按钮,用于现场母条码丢失或者损坏的场景来补打母条码】
|
5 years ago |
曾贞一
|
fb15536a34
|
【8254 中航-出库单-客户发运-新增销售订单字段】
|
5 years ago |
钮海涛
|
7aaed8fb79
|
task:1735
|
5 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
|
5 years ago |
钮海涛
|
81f380aec4
|
产品入库表新增
|
5 years ago |
钮海涛
|
b7dceccd71
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
钮海涛
|
f414274aeb
|
供货追踪
|
5 years ago |
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
许心洁
|
1a7d9edd40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
3cd2fb02f4
|
宁德BUG-JIS发运汇总JOB:BUG#8246
|
5 years ago |
曾贞一
|
8e529f46d7
|
【1722 BH-Bacth条码查询】
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 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
|
5 years ago |
钮海涛
|
724ba402bf
|
前端联调
|
5 years ago |
曾贞一
|
bc82c85790
|
【1721 BH-BH检测结果管理】
|
5 years ago |
钮海涛
|
cb8688105c
|
task:1727;1728;1729
|
5 years ago |
钮海涛
|
3fbf532c84
|
修复pom版本问题
|
5 years ago |
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
钮海涛
|
2e2ee2cc6c
|
Merge branch 'test' into dev
|
5 years ago |
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
曾贞一
|
c3b6376934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
f3e53ff1eb
|
【8150 20011-- 出库单明细界面,打印客户标签按钮,增加打印字段】
【8151 20011-- 出库单明细界面,打印客户标签按钮,重打按钮,补打客户标签按钮,三个按钮牛均无法打出客户零件号。关联bug7501---0429】
|
5 years ago |
钮海涛
|
7b2a4fdea7
|
合并dev代码
|
5 years ago |
钮海涛
|
475bb9370f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
qianhs
|
2303186fc4
|
【657】【中航WMS看板-成品发运率看板】
【658】【中航WMS看板-发运窗口时间看板】
【656】【 中航WMS看板-收货完成率看板】
【655】【 中航WMS看板-仓库预警看板】
【654】【中航WMS看板-30天供应商延期到货跟踪动态看板】
|
5 years ago |
钮海涛
|
398207b875
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
曾贞一
|
6190a4f66d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
156f0feedc
|
【1603 委外扣减查询】
|
5 years ago |
puxiao.liao
|
7c7691f583
|
bug8190【8190 中航-成品条码维护-批量修改客户代码-】
|
5 years ago |
钮海涛
|
4d383dda1b
|
新增事务报工查询
|
5 years ago |
puxiao.liao
|
f6988f36c8
|
1655 生产领料单增加替代料
|
5 years ago |
袁津哲
|
7789883f9b
|
开发导入功能模块
|
5 years ago |
曾贞一
|
509240126a
|
【1604 待入库数据查询】
|
5 years ago |
曾贞一
|
312cf59f49
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
88ce1e59cf
|
【1604 待入库数据查询】
|
5 years ago |
袁津哲
|
8a6c9aadef
|
开发导入功能模块
|
5 years ago |
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
puxiao.liao
|
e417e761c7
|
bug8124【8124 物料拆分-输入数量-系统异常】
|
5 years ago |
袁津哲
|
9518628c12
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
533d8e55e8
|
开发导入模块功能
|
5 years ago |
钮海涛
|
eb85cc232f
|
task:1623
|
5 years ago |
袁津哲
|
36b4e67020
|
导入模板功能建模
|
5 years ago |
袁津哲
|
ec1d8a2ff3
|
开发导入模板功能
|
5 years ago |
钮海涛
|
b25ff3cbba
|
bug:8137
|
5 years ago |
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
钮海涛
|
100d8b0019
|
Merge branch 'test' into dev
|
5 years ago |
钮海涛
|
c75a25b854
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
钮海涛
|
bd810c1c8c
|
task:1591
|
5 years ago |
qianhs
|
88279f9b8b
|
sonar bug修改
|
5 years ago |
曾贞一
|
e5c275499c
|
【冲突解决】
|
5 years ago |
曾贞一
|
255aefbcef
|
【1585 销售订单管理-销售订单维护】
|
5 years ago |
钮海涛
|
e64134a821
|
修复合并问题
|
5 years ago |
钮海涛
|
e9ec4cecfe
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
钮海涛
|
00fce0bded
|
新增客户物料发往地
|
5 years ago |
puxiao.liao
|
a2f7c3426e
|
bug7994【7994 麦格纳收货需求差异】
|
5 years ago |
钮海涛
|
01d3eeea51
|
新增客户物料发往地
|
5 years ago |
钮海涛
|
16f6861ecd
|
新增窗口时间
|
5 years ago |
钮海涛
|
331fb73d28
|
新增供应商维护基础数据
|
5 years ago |
袁津哲
|
30610476b9
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
1caea6bf36
|
修改实体数字字段
|
5 years ago |
qianhs
|
214fbb8da2
|
【1613 装车单新增中航打印格式】
|
5 years ago |
袁津哲
|
db7d86acc1
|
修改实体数字字段默认值0,不允许为空
|
5 years ago |
袁津哲
|
a5a8130388
|
修改不兼容sqlserver数据库查询语句
|
5 years ago |
王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
袁津哲
|
1a74363541
|
优化实体字段
|
5 years ago |
puxiao.liao
|
4b3923a64d
|
bug8056【8056 car_no,driver_no这两个字段没有写在事务表中,导致wms_move_to_erp中没有】
|
5 years ago |
钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
钮海涛
|
01ae9caa8c
|
task:1496
|
5 years ago |
puxiao.liao
|
63c827d0de
|
bug8050【8050 运输规则配置页面--新增成功,数据库有数据,但是页面不显示】
|
5 years ago |
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
曾贞一
|
b7e3aeef41
|
【8014 20011--报工记录表,查询数据重复---0415】
【8015 20011--报工记录报表,增加两列显示】
|
5 years ago |
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
钮海涛
|
288fb4a16b
|
修改POM版本号
|
5 years ago |
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
4884f59072
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
许心洁
|
2bc62e2444
|
动态查询:#需求变更 创建用户和更新用户也需要做成可选的
|
5 years ago |
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
5 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
|
5 years ago |
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
puxiao.liao
|
b8701bc398
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
puxiao.liao
|
7062e7a383
|
bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】
|
5 years ago |
曾贞一
|
46e0f502d0
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
曾贞一
|
a59a5e532e
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
5 years ago |
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
5 years ago |
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题,暂时先还原为最初方式
|
5 years ago |
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
5 years ago |
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
5 years ago |
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 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-预留外部拉动接口
|
5 years ago |
钮海涛
|
82d5332861
|
修复POM文件问题
|
5 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-预留外部拉动接口
|
5 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-预留外部拉动接口
|
5 years ago |
袁津哲
|
a8d84b1043
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
5de3c0bd7b
|
移库单模型中添加创建时间字段
|
5 years ago |
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
袁津哲
|
a4d32d6612
|
开发波次计划根据规则生成计划功能
|
5 years ago |
袁津哲
|
cb8a090aea
|
开发波次计划功能
|
5 years ago |
袁津哲
|
ffbd512b89
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
14cfa5fa47
|
创建波次计划规则实体类和规则明细实体类
|
5 years ago |
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
wynne1005
|
3c08e7794f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
贾文涛
|
eed24e0297
|
统一修改pom文件的项目版本问题
|
5 years ago |
puxiao.liao
|
a887aa1236
|
1454 基于责任区域和班次的任务推送
|
5 years ago |
wynne1005
|
286d605f09
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
puxiao.liao
|
bf427bbb31
|
bug7918【7918 条码操作记录表在更新后,缺少一行关联二维码字段,(更新后出现的问题)】
|
5 years ago |
钮海涛
|
d8779f42fb
|
从dev拉取最新代码
|
5 years ago |
廖普小
|
eb1c89e5e6
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
贾文涛
|
abf5d3eeb9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
贾文涛
|
048419d823
|
修改打包时版本号的定义,后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 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
|
5 years ago |
puxiao.liao
|
3a7d7a7924
|
bug7754【7754 需要一个接收对方信息在我们系统中触发报工的接口,当接收到数据时,需要在系统中生成一个标签,然后自动对该标签进行报工操作,接口中包含了条码,零件信息。】
|
5 years ago |
曾贞一
|
58053f4972
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
56c1bf8c44
|
【7648 在发运界面增加一个打开单据按钮。】
|
5 years ago |
钮海涛
|
cf0db5b8da
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
wynne1005
|
4b4bf4e433
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
a22d3d2333
|
动态查询:#任务1352(合并代码解决冲突)
|
5 years ago |
许心洁
|
030f2948fb
|
动态查询:#任务1352
|
5 years ago |
王杰
|
a9a7d78bd5
|
解决冲突
|
5 years ago |
袁津哲
|
f3b7ae8bc5
|
优化WmsPDA插件实体,去掉本地文件夹维护
|
5 years ago |
袁津哲
|
ab794aab0b
|
开发WMS动态加载插件功能
|
5 years ago |
袁津哲
|
2a0204ad99
|
开发WMS动态加载插件功能
|
5 years ago |
曾贞一
|
99ecde38d2
|
【7874 盘点主表中这两个字段由于后台取值错误,导致界面上无显示,需要修改,目前的逻辑看第二个字段中取值为库区,需要取库区所对应的库存地】
|
5 years ago |
曾贞一
|
10b5885ede
|
【7874 盘点主表中这两个字段由于后台取值错误,导致界面上无显示,需要修改,目前的逻辑看第二个字段中取值为库区,需要取库区所对应的库存地】
|
5 years ago |
puxiao.liao
|
4c199ce8ba
|
任务1470【 1470 504 北京麦格纳-采购收货--新增扫描二维码组件】
任务1467【1467 506 北京麦格纳-推荐入库-新增推荐动态库位组件】
|
5 years ago |
曾贞一
|
3d913456af
|
【7863 修改单据两步法操作后,单据条码明细直接变为已完成的问题】
|
5 years ago |
许心洁
|
8178e90abd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
许心洁
|
5bf7133ff1
|
动态查询:BUG#7845;BUG#7676;BUG#7675
|
5 years ago |
袁津哲
|
df21c218cd
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
袁津哲
|
b08d20fdb6
|
开发WMS动态加载插件功能
|
5 years ago |
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
袁津哲
|
c178540545
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
袁津哲
|
327af15040
|
开发WMS动态加载插件功能
|
5 years ago |
钮海涛
|
1eaacd1b28
|
Merge branch 'test' into dev
|
5 years ago |
钮海涛
|
333ef54c80
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
puxiao.liao
|
8a7c5fa1b5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 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 北京麦格纳-过期品自动报警】
|
5 years ago |
puxiao.liao
|
2da53135a8
|
bug7761【7761 发运配料界面,执行成功与无库存未做国际化,翻译资源已配置好】
bug【7766 拆分打印功能操作完成后下方需要回显,拆分出的条码的零件号,条码,数量,库位。】
|
5 years ago |
许心洁
|
313a0acfb8
|
test
|
5 years ago |
许心洁
|
5b92cae5d1
|
3D仓库:联调优化+收货看板BUG#7308
|
5 years ago |
puxiao.liao
|
9edfe18aec
|
【7565 收货分组功能要求。】bug7565
|
5 years ago |
puxiao.liao
|
9ca00bee68
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
puxiao.liao
|
8f584f250b
|
【7633 条码明细中,点击导出,日生产计划产生的条码无法被导出,界面上的导出应该是查到什么就导出什么,不需要再加其他额外的条件
】bug7633
|
5 years ago |
puxiao.liao
|
be479c2e76
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
许心洁
|
8a98efa9a6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
eaed7962ab
|
动态查询:工厂代码可以展示在表格中但是不能作为可选查询条件(BUG#7675)+
3D仓库:库位和存储区新增修改的长宽高校验都去掉(BUG#7723)
|
5 years ago |
曾贞一
|
38f1bd3b01
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
曾贞一
|
c0ce05e07c
|
【7648 在发运界面增加一个打开单据按钮】
|
5 years ago |
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
puxiao.liao
|
4c0b2a1961
|
【 7603 单个零件标签打印功能修改。
】bug7603
|
5 years ago |
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
曾贞一
|
0368152e71
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
许心洁
|
d815ca9b12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
许心洁
|
2c0ef55e85
|
解决动态查询BUG#7674,#7676+
流程导入BUG#7682
|
5 years ago |
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
5 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
|
5 years ago |