wugg 2 years ago
parent
commit
3c81d2a54c

+ 1 - 1
app/admin/controller/Activity.php

@@ -191,7 +191,7 @@ class Activity extends Base
         }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $activity_code = makeNo("ACT");
+        $activity_code = makeNo("AT");
         Db::startTrans();
         try{
             $data=[

+ 3 - 3
app/admin/controller/After.php

@@ -66,7 +66,7 @@ class After extends \app\BaseController
         }
         $rm= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $ri= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $returnCode=makeNo("RXS");
+        $returnCode=makeNo("RS");
         Db::startTrans();
         try{
             $in = [
@@ -537,7 +537,7 @@ class After extends \app\BaseController
                 $in=Db::name("order_returninfo")->save($return_info);
                 if($in){
                     $data=[
-                        'thNo'=>makeNo("TH"),
+                        'thNo'=>makeNo("ST"),
                         "orderCode"=>$info['orderCode'],
                         "order_type"=>$info['order_type'],
                         "outCode"=>$info['outCode'],
@@ -816,7 +816,7 @@ class After extends \app\BaseController
                 $info['updatetime']=date("y-m-d H:i:s");
                 $ro =Db::name("order_return")->save($info);
                 if($ro){
-                    $thNo =makeNo("TH");
+                    $thNo =makeNo("ST");
                     $thdata=[
                         "thNo"=>$thNo,
                         "orderCode"=>$out["orderCode"],

+ 4 - 4
app/admin/controller/Consult.php

@@ -178,7 +178,7 @@ class Consult extends Base
             $zx = Db::name("consult_order")->insert($data);
             if($zx){
                 foreach ($ladder as $value){
-                    $infoNo=makeNo("INF");
+                    $infoNo=makeNo("IF");
                     $specinfo=[];
                     if(isset($value['specinfo']) &&!empty($value['specinfo'])){
                         foreach ($value["specinfo"] as $v){
@@ -428,7 +428,7 @@ class Consult extends Base
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select();
         try{
-            $innew =makeNo("INF");
+            $innew =makeNo("IF");
             $info=[
                 "infoNo"=>$innew,
                 "zxNo"=>$zxinfo['zxNo'],
@@ -470,7 +470,7 @@ class Consult extends Base
                         unset($value['id']);
                         $value['infoNo']=$innew;
                         $value['bidNo']=makeNo("BD");
-                        $value['spuCode']=makeNo("SPU");
+                        $value['spuCode']=makeNo("SKU");
                         $value['status'] =0;
                         $value['updatetime'] =date("Y-m-d H:i:s");
                         $in = Db::name("consult_bids")->insert($value);
@@ -606,7 +606,7 @@ class Consult extends Base
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $bidNo=makeNo("BD");
-        $spucode=makeNo("SPU");
+        $spucode=makeNo("SKU");
         $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
         $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
 

+ 3 - 3
app/admin/controller/Goodup.php

@@ -318,7 +318,7 @@ class Goodup extends Base
         }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $spucode=makeNo("SPU");
+        $spucode=makeNo("SKU");
         Db::startTrans();
         try {
             $data=[
@@ -998,7 +998,7 @@ class Goodup extends Base
             }
             $data[]=[
                 "spuCode"=>$value,
-                "skuCode"=>makeNo("SKU"),
+                "skuCode"=>makeNo("SN"),
                 "platform_code"=>$platform,
                 "online_reason"=>$online_reason,
                 "online_remark"=>$online_remark,
@@ -1307,7 +1307,7 @@ class Goodup extends Base
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $nake = Db::name("good_nake")->where(["spuCode"=>$supcode,"is_del"=>0])->select()->toArray();
         $ladd=[];
-        $newCode =makeNo("SPU");
+        $newCode =makeNo("SKU");
         if(!empty($nake)){
             foreach ($nake as $value){
                     $tmp=[];

+ 3 - 3
app/admin/controller/Log.php

@@ -37,8 +37,8 @@ class Log extends BaseController
         $condition = [['type',"=",1]];
         $count = Db::name("action_log")->where($condition)->count();
         $total = ceil($count/$size);
-        $page = $page >= $total ? $total : $page;
-        $list =Db::name("action_log")->where($condition)->page($page,$size)->select();
+        $page = $page >= $total ? intval($total) : $page;
+        $list =Db::name("action_log")->where($condition)->page($page,$size)->order("addtime desc")->select();
         return app_show(0,"获取成功",['list'=>$list,"count"=>$count]);
     }
 
@@ -115,7 +115,7 @@ class Log extends BaseController
         $count = Db::name("order_msg")->where($condition)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list =Db::name("order_msg")->where($condition)->page(intval($page),$size)->select();
+        $list =Db::name("order_msg")->where($condition)->page(intval($page),$size)->order("addtime desc")->select();
         $data=[];
         $type = \think\facade\Config::get("order");
         foreach ($list as $value){

+ 4 - 4
app/admin/controller/Project.php

@@ -65,7 +65,7 @@ class Project extends Base
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         Db::startTrans();
         try {
-            $projectNo = makeNo("PRO");
+            $projectNo = makeNo("PR");
             $data=[
                 "projectNo"=>$projectNo,
                 "platform_id"=>$platform,
@@ -89,7 +89,7 @@ class Project extends Base
                 if(!empty($ladder)){
                     $la=[];
                     foreach ($ladder as $value){
-                        $pgNo = makeNo("PRI");
+                        $pgNo = makeNo("PI");
                         $temp=[];
                         $temp['pgNo']=$pgNo;
                         $temp['projectNo']=$projectNo;
@@ -483,7 +483,7 @@ class Project extends Base
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         Db::startTrans();
         try {
-            $planNo=makeNo("PLA");
+            $planNo=makeNo("PL");
             $total=0;
             $num_t=0;
             $origia=0;
@@ -818,7 +818,7 @@ class Project extends Base
             }
             $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
             $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
-        $orderCode = makeNo("CX");
+        $orderCode = makeNo("QR");
         Db::startTrans();
         try{
             $data = [

+ 1 - 1
app/admin/controller/Purchback.php

@@ -18,7 +18,7 @@ public function __construct(App $app)
 }
 public function create(){
     $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
-    $returnCode=makeNo("TH");
+    $returnCode=makeNo("CT");
     $cgdNo = isset($this->post['cgdNo']) && $this->post['cgdNo'] !==""? trim($this->post['cgdNo']) :"";
     if($cgdNo==""){
         return error_show(1002,"参数cgdNo不能为空");

+ 1 - 1
app/admin/controller/Purchin.php

@@ -154,7 +154,7 @@ class Purchin extends BaseController
            return error_show(1005,"采购单未发货");
        }
 
-        $wsm_in_code = makeNo("IC");
+        $wsm_in_code = makeNo("DF");
 //       $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
 //       if($wsm_code==""){
 //           return error_show(1004,"参数 wsm_code 不能为空");

+ 2 - 2
app/admin/controller/Reorder.php

@@ -50,7 +50,7 @@ class Reorder extends \app\BaseController
         if($returnadr!=''){
             $thnum=array_sum(array_column($returnadr,"return_num"));
         }
-        $returnCode=makeNo("RXS");
+        $returnCode=makeNo("RS");
         Db::startTrans();
         try{
             $in = [
@@ -490,7 +490,7 @@ class Reorder extends \app\BaseController
         if($order['wsend_num']<$num){
             return error_show(1002,"仓库未发货数量不足退货");
         }
-        $returnCode=makeNo("RXS");
+        $returnCode=makeNo("RS");
         Db::startTrans();
         try{
             $in = [

+ 7 - 14
app/admin/controller/Sale.php

@@ -22,7 +22,7 @@ class Sale extends Base
     public function create()
     {
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
-        $orderCode=makeNo("CX");
+        $orderCode=makeNo("QR");
         $customer_code= isset($this->post['customer_code'])&& $this->post['customer_code'] !=="" ? trim($this->post['customer_code']) :"";
         if($customer_code==""){
             return error_show(1002,"客户customer_code不能为空");
@@ -51,14 +51,7 @@ class Sale extends Base
         if($platform_id==''){
             return error_show(1004,"参数platform_id不能为空");
         }
-//        $zxinfoNo= isset($this->post['zxinfoNo'])&& $this->post['zxinfoNo'] !=="" ? trim($this->post['zxinfoNo']) :"";
-//        if($zxinfoNo=="" &&$order_type!==1){
-//            return error_show(1002,"参数 zxinfoNo 不能为空");
-//        }
         $platform_order =isset($this->post['platform_order']) && $this->post['platform_order'] !=="" ?trim($this->post['platform_order']):"";
-//        if($platform_order==''){
-//            return error_show(1004,"参数platform_order不能为空");
-//        }
         $good_code =isset($this->post['good_code']) && $this->post['good_code'] !=="" ?trim($this->post['good_code']):"";
         if($good_code==''){
             return error_show(1004,"参数good_code不能为空");
@@ -512,7 +505,7 @@ class Sale extends Base
                 $temp['arrive_time']=$arrtime;
                 $vmp = Db::name('order_addr')->insert($temp,true);
                 if($vmp>0){
-                    $outCode=makeNo("CK");
+                    $outCode=makeNo("DF");
                     $out=[
                         "orderCode"=>$orderCode,
                         "outCode"=>$outCode,
@@ -793,7 +786,7 @@ class Sale extends Base
                             $temp['arrive_time']=$arrtime;
                             $vmp = Db::name('order_addr')->insert($temp,true);
                             if($vmp>0){
-                                $outCode=makeNo("CK");
+                                $outCode=makeNo("DF");
                                 $out=[
                                     "orderCode"=>$orderCode,
                                     "outCode"=>$outCode,
@@ -1892,7 +1885,7 @@ class Sale extends Base
                     if ($dio['send_type'] == 1) {
                         $addr = Db::name('order_addr')->where(["orderCode" => $dio['orderCode'], 'is_del' => 0])->select();
                         foreach ($addr as $value) {
-                            $outCode = makeNo("CK");
+                            $outCode = makeNo("DF");
                             $data = [
                                 "wsm_code" => $wsm['wsm_code'],
                                 "orderCode" => $dio['orderCode'],
@@ -1920,7 +1913,7 @@ class Sale extends Base
                                 return error_show(1003, "创建失败");
                             }
                         }
-                        $wsm_in_code = makeNo("IC");
+                        $wsm_in_code = makeNo("CF");
                         $orin = [
                             "wsm_in_code" => $wsm_in_code,
                             "cgdNo" => $cgd,
@@ -2033,7 +2026,7 @@ class Sale extends Base
     public function out()
     {
         $token = isset($this->post['token']) && $this->post['token'] !== "" ? trim($this->post['token']) : "";
-        $outCode = makeNo("CK");
+        $outCode = makeNo("DF");
         $orderCode = isset($this->post['orderCode']) && $this->post['orderCode'] !== "" ? trim($this->post['orderCode']) : "";
         if ($orderCode == "") {
             return error_show(1002, "参数orderCoder不能为空");
@@ -2654,7 +2647,7 @@ class Sale extends Base
                     $num = $send_num;
                     $data=[];
                     foreach ($order as $val){
-                        $outCode = makeNo("CK");
+                        $outCode = makeNo("DF");
                         $cgd =Db::name("purchease_order")->where(["cgdNo"=>$val['cgdNo']])->find();
                         $tep=[];
                         $ornum=0;

+ 3 - 3
app/admin/controller/Salezx.php

@@ -18,7 +18,7 @@ class Salezx extends \app\BaseController
 
     public function create(){
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
-        $orderCode=makeNo("CX");
+        $orderCode=makeNo("QR");
         $customer_code= isset($this->post['customer_code'])&& $this->post['customer_code'] !=="" ? trim($this->post['customer_code']) :"";
         if($customer_code==""){
             return error_show(1002,"客户code不能为空");
@@ -159,7 +159,7 @@ class Salezx extends \app\BaseController
                         $temp['arrive_time']=$value['arrive_time'];
                         $vmp = Db::name('order_addr')->insert($temp,true);
                         if($vmp>0){
-                            $outCode=makeNo("CK");
+                            $outCode=makeNo("DF");
                             $out=[
                                 "orderCode"=>$orderCode,
                                 "outCode"=>$outCode,
@@ -524,7 +524,7 @@ class Salezx extends \app\BaseController
 
     public function outaddr(){
         $token= isset($this->post['token']) && $this->post['token'] !=="" ? trim($this->post['token']) :"";
-        $outCode=makeNo("CK");
+        $outCode=makeNo("DF");
         $orderCode = isset($this->post['orderCode']) && $this->post['orderCode'] !=="" ? trim($this->post['orderCode']) :"";
         if($orderCode==""){
             return error_show(1002,"参数orderCoder不能为空");