Przeglądaj źródła

添加小单的备货异常

lvhao 15 godzin temu
rodzic
commit
bf0a0b81a9

+ 60 - 22
core/CoreApp/controllers/Transfer.php

@@ -106,6 +106,8 @@ class Transfer extends Start_Controller {
 			$this->_sczexcel();
 	   }else if($arg == 'czbmsfcz'){
 			$this->_czbmIsOutExcel();
+	   }else if($arg == 'ycrk'){
+			$this->_ycrk();
 	   }
 		else
 		{
@@ -822,9 +824,10 @@ class Transfer extends Start_Controller {
 				}
 			}
             //取得信息列表
-            $info_list = $this->systemtransfer->find_all($where,'id,number,is_jiaji,pm,shipremarks,printtime,time,ctime12',$order_str,$start,$perpage);
+            $info_list = $this->systemtransfer->find_all($where,'id,number,is_jiaji,pm,shipremarks,printtime,time,ctime12,ycrk_type',$order_str,$start,$perpage);
 			$transfer = $this->transfer->find_all();
 			$t = array();
+			$t[0] = "";
 			foreach ($transfer as $v)
 		    {
 				$t[$v['id']] = $v['title'];
@@ -833,11 +836,20 @@ class Transfer extends Start_Controller {
 			 //格式化数据
             foreach ($info_list as $key=>$value)
 		    {
+
+				$is_jiaji = '';
 		        if($value['is_jiaji'] == 2){
-		            $info_list[$key]['is_jiaji'] = "<a href='javascript:void(0)' style='color:red'>加急</a>";
+		            $is_jiaji = "<a href='javascript:void(0)' style='color:red'>加急</a>";
 		        }else{
-		            $info_list[$key]['is_jiaji'] = "常规";
+		            $is_jiaji = "常规";
 		        }
+				if(empty($value['ycrk_type'])){
+					$is_jiaji .= "<p  onclick='addYcrk(".$value['id'].")'><b >异常入库</b></p>";
+				}else{
+					$is_jiaji .= "";
+				}
+
+				$info_list[$key]['is_jiaji'] = $is_jiaji;
 				$dd = $this->systemtransfer->read($value['id']);
 				$info_list[$key]['printtime'] = date('Y-m-d H:i:s',$value['printtime']);
 				$rk = explode('|',trim($dd['rk'],'|'));
@@ -876,31 +888,38 @@ class Transfer extends Start_Controller {
 					
 				    $type = ($v['type']==1)?'入库':'出库';
 				
-				    if($v['orver_flag'] == 1){
-						if($v['is_over'] == 0){
-							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ." <l style='font-weight:900;'>即将超时 </l></a>";
-							// $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
+					if(!empty($v['ycrk_type'])){
+						$info_list[$key]['time'] .= "订单已完成<a href='javascript:void(0);' style='color:#90f'>".' :'.date('Y-m-d H:i',$v['time']) ."</a><br>";
+					}else{
+						if($v['orver_flag'] == 1){
+							if($v['is_over'] == 0){
+								$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ." <l style='font-weight:900;'>即将超时 </l></a>";
+								// $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
+							}else{
+								$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ."</a>";
+							}
+						}elseif($v['orver_flag'] == 2){
+							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>超时! </l></a>";
+						}elseif($v['orver_flag'] == 3){
+							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#06f'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>【该单已取消】 </l></a>";
 						}else{
-							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ."</a>";
+							$info_list[$key]['time'] .= "<a  href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ."</a>";
+						}
+	
+						if($v['extra_status'] == 1){
+							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
+						}elseif($v['extra_status'] == 2 || $v['extra_status'] == 3){
+							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#A52A2A'>【工序间流转超过3天】</a><br>";
+						}else{
+							$info_list[$key]['time'] .= "<br>";
 						}
-					}elseif($v['orver_flag'] == 2){
-						$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>超时! </l></a>";
-					}elseif($v['orver_flag'] == 3){
-						$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#06f'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>【该单已取消】 </l></a>";
-					}else{
-						$info_list[$key]['time'] .= "<a  href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' :'.date('Y-m-d H:i',$v['time']) ."</a>";
-					}
-
-					if($v['extra_status'] == 1){
-						$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
-					}elseif($v['extra_status'] == 2 || $v['extra_status'] == 3){
-						$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#A52A2A'>【工序间流转超过3天】</a><br>";
-					}else{
-						$info_list[$key]['time'] .= "<br>";
 					}
+				    
 				}
 				$info_list[$key]['time'] = trim($info_list[$key]['time'],'<br>');
 				unset($info_list[$key]['ctime12']);
+				unset($info_list[$key]['ycrk_type']);
+				
             }
 			
 		    $total = $this->systemtransfer->find_count($where);
@@ -3319,4 +3338,23 @@ class Transfer extends Start_Controller {
 
 		return $tran_list;
 	}
+
+
+	public function _ycrk(){
+		if($this->input->method() == 'get'){
+			echo json_encode(array('msg'=>'请求方式不正确','success'=>false));exit;
+		}
+		$id = $this->input->post('id',true);
+
+		//更新数据 
+		$this->systemtransfer->save([
+			'ycrk_type'=>1,
+		],$id);
+		$this->systemtransfer_cr->insert([
+			'fid'=>$id,'lx'=>0,'type'=>1,'time'=>time(),'is_over'=>0,'over_flag'=>0,
+			'extra_status'=>0,'ycrk_type'=>1,
+		]);
+		echo json_encode(array('msg'=>'添加成功','success'=>true));exit;
+
+	}
 }

+ 33 - 4
template/erp/transfer_operate.html

@@ -158,11 +158,11 @@ function custom(){
 $(".data tr").each(function() {
 $(this).find('td:eq(0)').css("width","1%");
 $(this).find('td:eq(1)').css("width","10%");
-$(this).find('td:eq(2)').css("width","5%");
-$(this).find('td:eq(3)').css("width","25%");
-$(this).find('td:eq(4)').css("width","28%");
+$(this).find('td:eq(2)').css("width","6%");
+$(this).find('td:eq(3)').css("width","24%");
+$(this).find('td:eq(4)').css("width","27%");
 $(this).find('td:eq(5)').css("width","13%");
-$(this).find('td:eq(6)').css("width","20%");
+$(this).find('td:eq(6)').css("width","19%");
 });}
 window.onload = function() { 
 if(typeof $("select[name='printer']").length < 1) return;
@@ -292,6 +292,35 @@ $(".systemwindow").on('click', "#bdbbprintks", function() {
         }
     });
 	  });
+
+   function addYcrk(id){
+     $.post("/transfer/ycrk", {id:id}, function(a){
+        if(a.success){
+            layx.confirm('提示',a.msg,null,{
+				buttons:[
+					{
+						label:'确定',
+						callback:function(id, button, event){
+							layx.destroy(id);
+                            $(".search span").click();
+						}
+					}
+				],dialogIcon:'error',shadable:0.6
+			})
+        }else{
+           layx.confirm('提示',a.msg,null,{
+				buttons:[
+					{
+						label:'确定',
+						callback:function(id, button, event){
+							layx.destroy(id);
+						}
+					}
+				],dialogIcon:'error',shadable:0.6
+			})
+        }
+     }, "json")
+   }
 </script>
 <script>
     $(function(){