gsz
|
258e51aaf1
|
新增二车间工作工序枚举
|
4 years ago |
 钮海涛
|
038d07f337
|
BeanRelation增加lastList可以指定中断条件的方法。
|
4 years ago |
|
钮海涛
|
3e3d6450a8
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
gsz
|
1bf2f0057e
|
订单拆分甘特图根据单号模糊查询
|
4 years ago |
|
钮海涛
|
0450e2665a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
d69c8e682b
|
销售订单拆分下发。
|
4 years ago |
|
gsz
|
cfdcf6aaff
|
订单甘特图Model
|
4 years ago |
|
gsz
|
cc6ab7dc42
|
“修改项g修改甘特图pojo
|
4 years ago |
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/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-screen/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
sonar-project.properties
|
4 years ago |
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
|
puxiao.liao
|
4b1228fbbc
|
代码回滚
|
4 years ago |
|
钮海涛
|
c8074d219a
|
延期订单问题修复
|
4 years ago |
|
钮海涛
|
0bd75ba2fe
|
订单未完全下发最大间隔限制
|
4 years ago |
|
钮海涛
|
9c9af10973
|
完成硫化补满模最大间隔限制，订单未完全下发未完成。
|
4 years ago |
|
钮海涛
|
3a5fad2a74
|
完成硫化补满模最大间隔限制，订单未完全下发未完成。
|
4 years ago |
|
钮海涛
|
d0b880c7aa
|
牵纱拆余数到手工设备完成最大间隔限制，硫化补满模未完成。
|
4 years ago |
|
钮海涛
|
f0147d2680
|
按订单排程，完成最大间隔限制，牵纱拆余数到手工设备未完成。
|
4 years ago |
|
钮海涛
|
13d015e79a
|
工序间最大间隔限制调整前
|
4 years ago |
|
钮海涛
|
9910420ea8
|
完成最大间隔限制问题。
|
4 years ago |
|
钮海涛
|
ec3bcc7518
|
有库存问题修复
|
4 years ago |
|
钮海涛
|
b0d2a7b710
|
有库存问题修复
|
4 years ago |
|
钮海涛
|
39bc94ceda
|
成品检验报工
|
4 years ago |
|
钮海涛
|
65a2e93dae
|
修复动态拆分输入，输出数量更新出错
|
4 years ago |
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
钮海涛
|
7109cc8acb
|
生产计划下发到MES
|
4 years ago |
 王杰
|
a71774ba24
|
pom
|
4 years ago |
|
王杰
|
21ca70f863
|
pom
|
4 years ago |
|
钮海涛
|
c43eba89f3
|
新增三力士换模时间计算
|
4 years ago |
|
钮海涛
|
eeb9ab500b
|
排程结果优化
|
4 years ago |
|
钮海涛
|
6e6b0a7c11
|
排程结果优化
|
4 years ago |
|
钮海涛
|
c4660251cd
|
优化资源评估中间计算结果。
|
4 years ago |
|
钮海涛
|
3d66e54cea
|
优化资源评估中间计算结果。
|
4 years ago |
|
钮海涛
|
3a3bdc664a
|
修复工作左边界计算问题
|
4 years ago |
|
钮海涛
|
b5bbf7aefb
|
增加等待时间评估规则
|
4 years ago |
|
钮海涛
|
7bd17131b5
|
牵纱拆到手工设备，包布也需要拆到手工设备。
|
4 years ago |
|
钮海涛
|
4088a85a5c
|
更改左边界计算逻辑：后道工序满模即可开始。
|
4 years ago |
|
钮海涛
|
3dd67766b2
|
测试时间
|
4 years ago |
|
钮海涛
|
c09a078ce4
|
获取生产计划开始时间和结束时间去除service调用。
|
4 years ago |
|
钮海涛
|
9ace046d1d
|
修改动态拆分字段为对象关联
|
4 years ago |
|
钮海涛
|
99b43a6677
|
修改枚举
|
4 years ago |
|
钮海涛
|
b396d9cfd9
|
修改枚举
|
4 years ago |
|
钮海涛
|
ae88dda60d
|
新增MDM对象转换工具。
|
4 years ago |
|
钮海涛
|
4f697d51ec
|
演示问题修复
|
4 years ago |
|
钮海涛
|
63a8aef96d
|
演示问题修复
|
4 years ago |
|
钮海涛
|
95dffb65e0
|
新增成品检验报工
|
4 years ago |
|
钮海涛
|
736087852e
|
新增成品检验报工
|
4 years ago |
|
钮海涛
|
4590133c27
|
新增成品检验报工
|
4 years ago |
|
钮海涛
|
8b75ed1cfc
|
新增报工功能
|
4 years ago |
|
钮海涛
|
9ee464f67e
|
新增报工功能
|
4 years ago |
|
钮海涛
|
23f6f9285b
|
增加4车间补满模逻辑
|
4 years ago |
|
钮海涛
|
caafb9c317
|
修改排程计划逻辑
|
4 years ago |
|
钮海涛
|
0af24e4704
|
新增生产计划下发，生产计划打印功能。
|
4 years ago |
|
钮海涛
|
9f12a44fb6
|
完成插单功能
|
4 years ago |
|
钮海涛
|
a63334c5a1
|
去除事务sop
|
4 years ago |
|
钮海涛
|
919db8451e
|
导入问题修复
|
4 years ago |
|
钮海涛
|
f31071afc6
|
add export function
|
4 years ago |
|
钮海涛
|
f10f13a8de
|
add import field
|
4 years ago |
|
钮海涛
|
2ba2314968
|
add import field
|
4 years ago |
|
钮海涛
|
7cda94ab0c
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
0b354ef001
|
add import template
|
4 years ago |
许心洁
|
071b0ea9ce
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
# Conflicts:
# sonar-project.properties
|
4 years ago |
|
钮海涛
|
3b8a5482ad
|
add sanlux project
|
4 years ago |
|
王杰
|
5a5874b137
|
test
|
4 years ago |
|
王杰
|
45a1b63a23
|
Merge branch 'test'
|
4 years ago |
|
王杰
|
f1db936f42
|
pom
|
4 years ago |
|
王杰
|
d2f03a966e
|
Merge branch 'dev' into test
|
4 years ago |
|
钮海涛
|
8c4bf4b0fe
|
修复导入excel大数据问题
|
4 years ago |
|
钮海涛
|
1bc4c491b6
|
修改导入功能
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
wynne1005
|
1e9f1a5c47
|
质量检测 1
|
5 years ago |
|
钮海涛
|
729a7b6990
|
合并冲突
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
wynne1005
|
f06f51cc7e
|
master merge test
|
5 years ago |
|
钮海涛
|
8d38a297d2
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
6dd429d328
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
钮海涛
|
8ae3c65cb3
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
dcc23e56cd
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
2bbc0bea66
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
1581e8b86c
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
c980c6c87c
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
32eb9dc797
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
629817ddef
|
三力士数据排程
|
5 years ago |
|
钮海涛
|
9475667e74
|
Finish Task #2134 Cost: 8h
|
5 years ago |
|
钮海涛
|
aeb347b1fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
ce020cc1ab
|
Start Task #2134 Cost: 8h
|
5 years ago |
|
wynne1005
|
60c1f6ecab
|
还原pom
|
5 years ago |
|
wynne1005
|
47ae0b46ef
|
还原pom
|
5 years ago |
|
wynne1005
|
ba1ba8bc0f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
8623a5a13d
|
还原pom
|
5 years ago |