陈思洁
|
11748bb19e
|
【12066 19048-喷涂展示组件颜色查询方式变更-20201024】
|
5 years ago |
Aisiyu
|
219dd0ddd7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
47f464b01d
|
[1211 天津麦格纳货运看板 ]
|
5 years ago |
 曾贞一
|
143e2f1947
|
【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】
|
5 years ago |
puxiao.liao
|
23537e76e5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
e68735be83
|
MOVE_SN 增加 left_code 属性
|
5 years ago |
 王杰
|
ade2d60849
|
总装 质量判定
|
5 years ago |
|
王杰
|
d7092a7f52
|
总装标记不良
|
5 years ago |
宋军超
|
5d41023df6
|
修改天津涂装看板
|
5 years ago |
songss
|
532e99eb8b
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
76a0703bac
|
调整中航看板接口地址
|
5 years ago |
joke.wang
|
0d12d01ebf
|
生产报功表增加分组标识
|
5 years ago |
wynne1005
|
ff45755577
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2ff6eded6e
|
修改Oee
|
5 years ago |
许心洁
|
08125e3b0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
汪云昊
|
c9b4b37c23
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
687de9d828
|
feat(form):支持存储过程参数
|
5 years ago |
|
汪云昊
|
e87740e723
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
f47b699146
|
feat(form):支持存储过程参数
|
5 years ago |
|
曾贞一
|
4ee1875097
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
8d91675109
|
【12155 20145+系统参数页面，参数编码也支持模糊查询】
|
5 years ago |
|
puxiao.liao
|
e6e5982d73
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
63b7162932
|
mgn-bj 半成品看板
|
5 years ago |
|
汪云昊
|
dceb9b17a5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
91f68d50d4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
91b1a67f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
eb03280b2d
|
doc(sql):getStringLikePack方法标记不推荐
|
5 years ago |
|
汪云昊
|
f1ab018d85
|
feat(softswitch):重试功能
|
5 years ago |
|
曾贞一
|
b979a9471c
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
Aisiyu
|
3b5cd84e6e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
曾贞一
|
e55e8b6f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
5e8b023fd5
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
762f9d4a9b
|
Fix bug#12020
19058-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
Aisiyu
|
8b94991408
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
2db034a7f8
|
[1211 天津麦格纳WMS-ASN到货看板 ]
|
5 years ago |
|
宋军超
|
692cd283f7
|
添加天津涂装看板-设备实时监控
|
5 years ago |
|
puxiao.liao
|
6269ee358c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc15b56ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
d8e5aa44bc
|
pom.xml
|
5 years ago |
|
许心洁
|
92fec185b8
|
任务#28142909
|
5 years ago |
|
陈思洁
|
8dfcb7f429
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
3dc951c34f
|
【11964 19048-喷涂抛光报表变更-20201021】
|
5 years ago |
|
曾贞一
|
9a350912ea
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
|
5 years ago |
|
曾贞一
|
5487c165ff
|
【11883 20021--北美领料需求变更--1023】
|
5 years ago |
|
puxiao.liao
|
87611856dd
|
天津麦格纳多级BOM
|
5 years ago |
|
宋军超
|
37c95dc6b3
|
添加天津涂装看板
|
5 years ago |
|
wynne1005
|
20ee1215d2
|
解决 包名细化 导致冲突
|
5 years ago |
|
wynne1005
|
9d81ec30d1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6d4e8608c4
|
注塑 组装报表开发完毕
|
5 years ago |
rock.yu
|
104fa0efa5
|
完成ERP库存差异报表
|
5 years ago |
|
joke.wang
|
f57f4e25be
|
mgn-bj 总屏看板
|
5 years ago |
|
汪云昊
|
a9520cecf7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
31cdda5b33
|
feat(softswitch):适配记录,FTP文件支持SID
|
5 years ago |
|
曾贞一
|
c9378a7d8c
|
【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】
|
5 years ago |
|
许心洁
|
38ddd82ef9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
d7bad41b29
|
天津麦格纳BUG#12111，12110，12108，12105
|
5 years ago |
Dominic_Xiao
|
df35a22aac
|
解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
5e1d0a75c9
|
解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
4684466e7e
|
解决BUG:19048-班次时间显示异常:修改查询的SQL语句
|
5 years ago |
|
Dominic_Xiao
|
f57be38c2b
|
解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句
|
5 years ago |
|
puxiao.liao
|
760307910a
|
天津MGN系列BUG修复
|
5 years ago |
|
宋军超
|
1b6264e80d
|
添加天津涂装看板
|
5 years ago |
|
rock.yu
|
0fb04b8370
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
rock.yu
|
3ad59884a8
|
增加计算工单的提前时间属性
|
5 years ago |
|
songss
|
2ed5108699
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
36928196c1
|
中航看板-调整返回接口参数
|
5 years ago |
|
rock.yu
|
330cede03e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
b6a309bacf
|
增加 ERP 对账数据表
|
5 years ago |
|
puxiao.liao
|
023811d0fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
6f239ee756
|
Fix bug#12019
12019-KT根据销售订单创建销售出库单（客户发运）
|
5 years ago |
|
joke.wang
|
5227540ecc
|
队列表添加索引
|
5 years ago |
|
许心洁
|
586365dc69
|
任务#2893,#2894,#2901
|
5 years ago |
|
陈思洁
|
4e013a7ef0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6fcf32aa80
|
【2890 10 2.3.8安灯作业优化】
|
5 years ago |
|
songss
|
e0d315a1f8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
d9040143f9
|
新增中航产线看板-每小时产量接口
|
5 years ago |
|
puxiao.liao
|
24acb86dff
|
实时库存查询&导出优化
|
5 years ago |
 钮海涛
|
2b4ff2300d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
582ef23ca3
|
修复SWEB问题
|
5 years ago |
|
wynne1005
|
1730dc27c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4d4ad7ff84
|
天津注塑看板
|
5 years ago |
|
puxiao.liao
|
62d5d62cef
|
北京MGN系列BUG修复
|
5 years ago |
|
songss
|
95936d40fe
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
783022646c
|
新增中航产线状态图接口
|
5 years ago |
|
rock.yu
|
a953523245
|
增加 ERP 快照相关表
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
钮海涛
|
1037ad6e68
|
修复问题
|
5 years ago |
|
puxiao.liao
|
3de97d5b98
|
北京MGN系列BUG修复
|
5 years ago |
|
王杰
|
f6ad2824b2
|
11984 19048-组装生产计划报表增加字段-20201020
|
5 years ago |
|
王杰
|
7fcbf3f4e2
|
:wq
erge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
puxiao.liao
|
6907ab6dc0
|
北京麦格纳看板需求
|
5 years ago |
|
王杰
|
97be3f186a
|
工单生产时间变更定时任务实体
|
5 years ago |
|
钮海涛
|
0e75cde494
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
63a06fcc27
|
修改供应商端登录及供应商端代码重构
|
5 years ago |
|
陈思洁
|
a6acf3d616
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
82a769cae1
|
【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】
2887 10 2.3.7安灯通知优化
|
5 years ago |
|
许心洁
|
8c4ae6ff34
|
任务#2893,2894
|
5 years ago |
|
puxiao.liao
|
0216cf59c4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
051417c10e
|
北京麦格纳看板
|
5 years ago |