nies
|
2619f42700
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
nies
|
a3d2749161
|
(update)SuitModel 增加requestId
|
3 years ago |
|
nies
|
dd699216ac
|
Merge branch 'test' into ext-dev
|
3 years ago |
|
聂帅
|
65c22dec22
|
Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/316
|
3 years ago |
jun
|
0ef89f2a6d
|
18934 原材料扣减job替换
|
3 years ago |
 钮海涛
|
d2bbca3491
|
新增同班次物料相同评估规则
|
3 years ago |
|
nies
|
4b3449863f
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
f1e158737b
|
Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/314
|
4 years ago |
|
钮海涛
|
55f88edd0f
|
Merge pull request '资源甘特图提示' (#315) from andly.pan/i3plus-pojo:ext-dev into ext-dev
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/315
|
4 years ago |
|
钮海涛
|
f74038f88c
|
强插生产计划前提交
|
4 years ago |
andly.pan
|
64e48bf350
|
资源甘特图提示
|
4 years ago |
 曾贞一
|
7f7baa1ea4
|
【18835 19081-盘点策略-循环规则-选项可配置】
|
4 years ago |
|
钮海涛
|
80851b5a06
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
0cf4d5742d
|
四车间问题修复
|
4 years ago |
|
nies
|
204bbad81c
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
38b1ce6643
|
(update)更新aps-4的端口为8400
|
4 years ago |
|
nies
|
7343b4901d
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
d06fe76744
|
增加aps_3和aps_4的枚举配置
|
4 years ago |
|
nies
|
3d4a0e0bb9
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
jun
|
93d84b66f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
4 years ago |
|
jun
|
67ed074d35
|
18681 交易类型需要导出功能
|
4 years ago |
Dominic_Xiao
|
71ad8a1e28
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
6ba8a2f3bb
|
MES_客户JIT队列下达配置增加项目代码字段
|
4 years ago |
castle.zang
|
b4775eabdf
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
castle.zang
|
cf0e1825a3
|
合并jimmy代码
|
4 years ago |
|
castle.zang
|
0c6803eb86
|
合并王宝玉合并请求
|
4 years ago |
 臧学普
|
0e5cafae91
|
Merge pull request 'WmsBH物料子检测项新增录入方式字段' (#312) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/312
|
4 years ago |
 王宝玉
|
cdd7f7bed2
|
WmsBH物料子检测项新增录入方式字段
|
4 years ago |
|
nies
|
2cff78cba2
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
443a8a200d
|
Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/311
|
4 years ago |
|
王宝玉
|
4625987eef
|
Mes散件BOM增加项目代码字段
|
4 years ago |
|
王宝玉
|
5056f30f45
|
核心包mes散件产品配置BOM新增项目代码
|
4 years ago |
|
nies
|
7ab206edbd
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
fc9ef265f9
|
修改aps-2的menurootid
|
4 years ago |
|
nies
|
b2da2bd935
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
0400305d91
|
增加aps-2的枚举配置
|
4 years ago |
|
钮海涛
|
b623bde133
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
c8ce17363b
|
四车间问题修复
|
4 years ago |
|
nies
|
39fb0508fc
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
曾贞一
|
7b9a91fd0f
|
【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】
|
4 years ago |
gsz
|
365c9e927e
|
17789 20065-排程失败的错误需要在页面上进行提示-20211009
|
4 years ago |
|
gsz
|
3c9bb9fff0
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo
|
4 years ago |
|
钮海涛
|
b0fe76ab6a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
5a73e89e97
|
四车间问题修复
|
4 years ago |
|
nies
|
38add62a60
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
5b5e00eee7
|
model core 增加SysRoleModel
|
4 years ago |
|
nies
|
72673bfa12
|
平台新增用户角色关联model
|
4 years ago |
|
nies
|
28770cf619
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
castle.zang
|
b388ea9926
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
钮海涛
|
da300c7ccb
|
增加一键下发功能。
|
4 years ago |
|
钮海涛
|
6effb386a3
|
增加一键下发功能。
|
4 years ago |
|
钮海涛
|
8de712ad1d
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
462f5c9d58
|
增加一键下发功能。
|
4 years ago |
|
nies
|
85782e1036
|
Merge branch 'test' into ext-dev
|
4 years ago |
 王杰
|
3270395d94
|
安灯
|
4 years ago |
|
臧学普
|
9d8371bdac
|
Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/306
|
4 years ago |
|
nies
|
5666b5d120
|
软适配增加华域相关的配置
|
4 years ago |
|
钮海涛
|
3af6e02e52
|
大逻辑调整前提交：部分下发的订单重新排程不影响交期早的订单。
|
4 years ago |
|
钮海涛
|
2ec1229e75
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
e97f49d8ee
|
修复四车间问题
|
4 years ago |
|
nies
|
7bf443a463
|
WmsActionResponseBean 删除多余的taskNO
|
4 years ago |
|
nies
|
0f92e2bbf9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
聂帅
|
74dab6e6d0
|
Merge pull request '成都麦格纳，wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/304
|
4 years ago |
|
castle.zang
|
d771304733
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
77795be8df
|
StationRequestBean 增加 缓存数据来源class
|
4 years ago |
蒋鸿辉
|
0cfac0aaaf
|
工单表增加系统同步标志字段
|
4 years ago |
|
gsz
|
b15164d8a6
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo
|
4 years ago |
|
钮海涛
|
29acf31f74
|
修复四车间问题
|
4 years ago |
|
gsz
|
351e542fd9
|
18062 20065-新增报表显示顶层订单的输入和输出情况-20211019
|
4 years ago |
|
nies
|
b8662be266
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
211d20e840
|
修改打印模板复杂查询
|
4 years ago |
|
jun
|
a7b6cd22d3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
4 years ago |
|
钮海涛
|
10bd8f2f9e
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
b1af42c78b
|
修复四车间问题
|
4 years ago |
|
jun
|
93f50a56be
|
WMS_产品报工明细信息 新增@ApiParam("是否已经生成领料单")字段
|
4 years ago |
|
jun
|
e390e7fc33
|
成都：PULL_WAY_STATUS枚举新增 OVER_PULL(80, "过点拉动")
|
4 years ago |
|
castle.zang
|
d04286164b
|
合并王杰：添加索引
|
4 years ago |
|
castle.zang
|
1072745cda
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
臧学普
|
f7d8ee1026
|
Merge pull request '索引' (#302) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/302
|
4 years ago |
|
castle.zang
|
34cb9d311f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
钮海涛
|
5888b17cd8
|
修复四车间问题
|
4 years ago |
|
nies
|
5acd3270f9
|
修改pom中版本为1.0.0.1
|
4 years ago |
|
nies
|
968708d1b8
|
删除多余的taskNo
|
4 years ago |
|
钮海涛
|
b16b1b0564
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
98cfaf0db2
|
修复四车间问题
|
4 years ago |
|
castle.zang
|
124cc7d729
|
Merge remote-tracking branch 'upstream/test' into test
|
4 years ago |
|
castle.zang
|
ace269e8aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
ddc10672c4
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
5f4b8efe56
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
聂帅
|
a995805f74
|
Merge pull request '二开项目目前pojo类无法同步,在核心包新增pojo' (#303) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/303
|
4 years ago |
|
Dominic_Xiao
|
cbba75032a
|
二开项目目前pojo类无法同步,在核心包新增pojo
|
4 years ago |
|
王杰
|
cedc61b6a8
|
索引
|
4 years ago |
|
nies
|
f8d1d85c86
|
platform 增加job执行记录相关的bean
|
4 years ago |
|
jun
|
49442ab5aa
|
成都麦格纳，wmsCqMaster新增构造方法
|
4 years ago |
|
王杰
|
a6ed27b901
|
索引
|
4 years ago |
|
钮海涛
|
4ffff9e3df
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
8406b0c3e8
|
修复二车间硫化问题
|
4 years ago |
|
nies
|
9b9b9f9113
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
聂帅
|
1314ee7c20
|
Merge pull request '华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货' (#301) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/301
|
4 years ago |
|
jun
|
685166caf7
|
华域枚举OUT_MOVEMENT_BUSI_TYPE 新增 安全库存补货
|
4 years ago |