diff --git a/app-ht/modules/production/controllers/ProductionController.php b/app-ht/modules/production/controllers/ProductionController.php
index eed961c..4050e9f 100644
--- a/app-ht/modules/production/controllers/ProductionController.php
+++ b/app-ht/modules/production/controllers/ProductionController.php
@@ -62,7 +62,6 @@ class ProductionController extends BaseController
$productionEndTime = strtotime($productionEndTime) + 86400;
$where[] = ['<=', 'p.name', $productionEndTime];
}
-
if ($type == 0) {
$pageList = ProductionRepository::getPageList($where, 0 , 0);
$pages = null;
diff --git a/app-ht/modules/upgrade/controllers/UpgradeController.php b/app-ht/modules/upgrade/controllers/UpgradeController.php
index e25d923..0567b42 100644
--- a/app-ht/modules/upgrade/controllers/UpgradeController.php
+++ b/app-ht/modules/upgrade/controllers/UpgradeController.php
@@ -653,7 +653,6 @@ class UpgradeController extends BaseController
return $this->redirect($upgradeURL);
}
-
if (empty($upgradeModel->manufacture_id)) {
Yii::$app->session->setFlash('error', '请先配置好厂商');
return $this->redirect($upgradeURL);
@@ -668,10 +667,13 @@ class UpgradeController extends BaseController
}
$exitUpgradeModel = UpgradeRepository::findOne([
'manufacture_id' => $upgradeModel->manufacture_id,
- 'project_id' => $upgradeModel->project_id,
- 'model_id' => $upgradeModel->model_id,
- 'is_delete' => 0,
- 'status' => UpgradeStatus::STATUS_ON
+ 'project_id' => $upgradeModel->project_id,
+ 'model_id' => $upgradeModel->model_id,
+ 'is_delete' => 0,
+ 'type' => $upgradeModel->type,
+ 'version' => $upgradeModel->version,
+ 'package_name' => $upgradeModel->package_name,
+ 'status' => UpgradeStatus::STATUS_ON
]);
if ($exitUpgradeModel && $upgradeModel->id != $exitUpgradeModel->id) {
@@ -719,6 +721,12 @@ class UpgradeController extends BaseController
$modelId = $request->post("model");
$type = $request->post("type");
$id = $request->post('id');
+ $version = $request->post('version');
+ $package_name = $request->post('package_name');
+ if (empty($package_name)) {
+ $e->message = '请先录入一个包名';
+ return $this->renderJson($e);
+ }
if (empty($manufactureId)) {
$e->message = '请先选择厂商';
return $this->renderJson($e);
@@ -734,19 +742,20 @@ class UpgradeController extends BaseController
return $this->renderJson($e);
}
- $upgradeModel = UpgradeRepository::findOne(['manufacture_id' => $manufactureId, 'project_id' => $projectId, 'model_id' => $modelId, 'is_delete' => 0, 'status' => UpgradeStatus::STATUS_ON, 'type' => $type]);
- if ($upgradeModel && empty($id)) {
- $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.'的发布版本，请先取消发布的版本再上传'.$upgradeModel->id;
- return $this->renderJson($e);
+ $upgradeModel = UpgradeRepository::findOne(['manufacture_id' => $manufactureId, 'project_id' => $projectId, 'model_id' => $modelId, 'is_delete' => 0, 'package_name' => $package_name, 'type' => $type]);
+ if ($upgradeModel && empty($id) ) {
+ $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.' 包名为'.$package_name.'的版本，请先确认再上传';
+ return $this->renderJson($e);
+
}
- if ($upgradeModel && !empty($id) && $id != $upgradeModel->id) {
- $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.'的发布版本，请先取消发布的版本再上传！';
+ if ($upgradeModel && !empty($id) && $id != $upgradeModel->id ) {
+ $e->message = '该厂商该批次已经存在一个版本号为：'.$upgradeModel->version.' 包名为'.$package_name.'的版本，请先确认再上传！';
return $this->renderJson($e);
}
-
$e->success = true;
$e->message = 'ok';
+
return $this->renderJson($e);
}
}
\ No newline at end of file
diff --git a/app-ht/modules/upgrade/views/upgrade/create.php b/app-ht/modules/upgrade/views/upgrade/create.php
index d1fe7d9..ee89de8 100644
--- a/app-ht/modules/upgrade/views/upgrade/create.php
+++ b/app-ht/modules/upgrade/views/upgrade/create.php
@@ -45,13 +45,13 @@ $this->params['breadcrumbs'][] = $this->title;
- " name="version" placeholder="请填写APP版本号" style="margin-top: -6px;" class="form-control"">
+ " id="version" name="version" placeholder="请填写APP版本号" style="margin-top: -6px;" class="form-control"">
@@ -142,11 +142,11 @@ $this->params['breadcrumbs'][] = $this->title;
var project_id = $("#project").val();
var model_id = $("#model").val();
var path = $("input[name='path']").val();
- if (a == ""){
+ if ($.trim(a) == ""){
alert("APP版本号不能为空");
return false;
}
- if (package_name == ""){
+ if ($.trim(package_name) == ""){
alert("安装包名不能为空");
return false;
}
@@ -268,7 +268,9 @@ $this->params['breadcrumbs'][] = $this->title;
var project = $('#project').val();
var model = $('#model').val();
var type = $('#type').val();
- $.post(checkUpgradeUrl, {manufacture:manufacture, project:project,model:model,type:type}, function(res){
+ var package_name = $('#package_name').val();
+ var version = $('#version').val();
+ $.post(checkUpgradeUrl, {manufacture:manufacture, project:project,model:model,type:type, package_name:package_name, version:version}, function(res){
if (res.success) {
if (that.hasClass('disabled')) {
return false;
--
libgit2 0.21.0