|
|
@@ -4,6 +4,7 @@ namespace app\index\controller;
|
|
|
|
|
|
use app\index\model\BoxActionModel;
|
|
|
use app\index\model\BoxModel;
|
|
|
+use app\index\model\CabinetModel;
|
|
|
use app\index\model\OrderModel;
|
|
|
use think\Controller;
|
|
|
|
|
|
@@ -30,7 +31,9 @@ class Order extends Base
|
|
|
public function RecordStore(){
|
|
|
$order_sn = input('param.order_sn');
|
|
|
$trunk = input('param.trunk');
|
|
|
- $cabinet = input('param.cabinet');
|
|
|
+ $cabinet_code = input('param.cabinet');
|
|
|
+ $cabinet = CabinetModel::where('cabinet_code',$cabinet_code)->find();
|
|
|
+ $cabinet = $cabinet['cabinet_number'];
|
|
|
$checkNumber = $this->CheckNumber($cabinet , $trunk);
|
|
|
if($checkNumber == false){
|
|
|
json_error(2005);
|
|
|
@@ -62,7 +65,9 @@ class Order extends Base
|
|
|
|
|
|
public function RecordFetch(){
|
|
|
$trunk = input('param.trunk');
|
|
|
- $cabinet = input('param.cabinet');
|
|
|
+ $cabinet_code = input('param.cabinet');
|
|
|
+ $cabinet = CabinetModel::where('cabinet_code',$cabinet_code)->find();
|
|
|
+ $cabinet = $cabinet['cabinet_number'];
|
|
|
$BoxModel = new BoxModel();
|
|
|
$Box = $BoxModel->getOneCabinetBox($cabinet , $trunk);
|
|
|
if(empty($Box)){
|
