浏览代码

Material 添加库存计量单位

ruijiang@yiguanjia.me 8 年之前
父节点
当前提交
2ffef212b2
共有 2 个文件被更改,包括 26 次插入6 次删除
  1. 19 4
      www/protected/controllers/MaterialController.php
  2. 7 2
      www/protected/modules/o2o/models/Material.php

+ 19 - 4
www/protected/controllers/MaterialController.php

@@ -1,7 +1,7 @@
 <?php 
 /**
  * 物资控制器
- * @author     2015-09-16
+ * @author zhouxuchen 2015-09-16
  */
 class MaterialController extends AdminController {
 
@@ -116,7 +116,7 @@ class MaterialController extends AdminController {
         $material->enable = $enable;
         $material->enable_str = $this->enable_str($enable);
         $material->remarks = $remarks;
-        
+
         $arr_addMaterial = array('name', 'unit_str', 'unit', 'price', 'stock', 'stockWarnLine', 'addTime', 'user', 'status', 'status_str', 'enable', 'enable_str', 'remarks');
 
         $success = $material->save(true, $arr_addMaterial);
@@ -212,7 +212,7 @@ class MaterialController extends AdminController {
             $stock->station = new MongoId($sid);
             $stock->stationName = $station->name;
 
-            
+
             $arr_addStock = array('mid', 'mname', 'operate', 'operate_str', 'user', 'time', 'username', 'num', 'tot_price', 'lastStock', 'newStock', 'remarks', 'object', 'objectName', 'station', 'stationName');
         } else {
             $stock->objectName = '公司总库';
@@ -229,7 +229,7 @@ class MaterialController extends AdminController {
         $stock->username = $userInfo->name;
         $stock->time = $time;
 
-        $stock->remarks = $remarks;        
+        $stock->remarks = $remarks;
 
         $material->stock = $stock->newStock;
         $material->status = $this->status($material->stock, $material->stockWarnLine);
@@ -333,6 +333,21 @@ class MaterialController extends AdminController {
             case 6:
                 $unit_str = '双';
                 break;
+            case 7:
+                $unit_str = '只';
+                break;
+            case 8:
+                $unit_str = '个';
+                break;
+            case 9:
+                $unit_str = '套';
+                break;
+            case 10:
+                $unit_str = '副';
+                break;
+            case 11:
+                $unit_str = '毫升';
+                break;
             default:
                 $unit_str = '未找到相应单位';
                 break;

+ 7 - 2
www/protected/modules/o2o/models/Material.php

@@ -1,7 +1,7 @@
 <?php 
 /**
  * 物资
- * @author     2015-09-16
+ * @author zhouxuchen 2015-09-16
  */
 class Material extends MongoAr {
 
@@ -37,7 +37,12 @@ class Material extends MongoAr {
         3 => array('name' => '盒'),
         4 => array('name' => '台'),
         5 => array('name' => '件'),
-        6 => array('name' => '双')
+        6 => array('name' => '双'),
+        7 => array('name' => '只'),
+        8 => array('name' => '个'),
+        9 => array('name' => '套'),
+        10 => array('name' => '副'),
+        11 => array('name' => '毫升')
     );
 
     public function __construct($scenario='insert') {