소스 검색

添加工厂加急单提醒

lvhao 7 달 전
부모
커밋
ac72dad8fb
5개의 변경된 파일75개의 추가작업 그리고 10개의 파일을 삭제
  1. 24 4
      core/CoreApp/controllers/Transfer.php
  2. 2 2
      template/erp/js/print.js
  3. BIN
      template/erp/music/jiaji.mp3
  4. 23 2
      template/erp/transfer_ck.html
  5. 26 2
      template/erp/transfer_rk.html

+ 24 - 4
core/CoreApp/controllers/Transfer.php

@@ -561,6 +561,12 @@ class Transfer extends Start_Controller {
 				$post['type'] = $this->input->post('type',true);
 				$post['shipremarks'] = $this->input->post('b',true);
 				$post['ph'] = $this->input->post('ph',true);
+				$is_jiaji = $this->input->post('is_jiaji',true);
+				if($is_jiaji == 2){
+					$post['is_jiaji'] = 2;
+				}else{
+					$post['is_jiaji'] = 0;
+				}
 				$zps = $this->input->post('zps',true);
 				$post['purchase'] = $this->input->post('purchase',true);//供应商
 		        $post['time'] = $time;//操作时间
@@ -615,7 +621,7 @@ class Transfer extends Start_Controller {
 						}
 						$label = substr($time,1)*100;
 						$post['label'] = $label+$i;
-				   		$rows[] = array('num'=>$post['label'],'number'=>$post['number'],'shipremarks'=>$post['shipremarks'],'ph'=>$post['ph'],'ex'=>$express['servicename'],'time'=>''.date('Y-m-d',$post['printtime']),'gtime'=>date('YmdH',time()),'s'=>'('.($i+1).'/'.$xbqnum.')','t'=>$t,'able_ext'=>$able_ext);
+				   		$rows[] = array('num'=>$post['label'],'number'=>$post['number'],'shipremarks'=>$post['shipremarks'],'ph'=>$post['ph'],'ex'=>$express['servicename'],'time'=>''.date('Y-m-d',$post['printtime']),'gtime'=>date('YmdH',time()),'s'=>'('.($i+1).'/'.$xbqnum.')','t'=>$t,'able_ext'=>$able_ext,'is_jiaji'=>$is_jiaji);
 						$this->systemtransfer->insert($post);
 					}
 			    }
@@ -966,6 +972,7 @@ class Transfer extends Start_Controller {
 				}
 			}
 			$cztime = 'ctime'.$transfer;
+	
 			if(($transfer == 3 && $lb['dbapi'] < 99 && $cz == 2) || ($transfer == 13 && $lb['dbapi'] < 99 && $cz == 1))//出入库用这个
 			//if(($transfer == 8 || $transfer == 13) && $lb['dbapi'] < 99 && $cz == 1)//单入库
 			{
@@ -998,7 +1005,12 @@ class Transfer extends Start_Controller {
             				}
 				 	  	    else
 				 	  	    {
-				     	  	    echo json_encode(array('music'=>'1','success'=>true));exit;
+								if($lb['is_jiaji'] == 2){
+									echo json_encode(array('music'=>'1','is_jiaji'=>2,'success'=>true));exit;
+								}else{
+									echo json_encode(array('music'=>'1','success'=>true));exit;
+								}
+				     	  	    
 				 	  	    }
 						}
 						else
@@ -1047,7 +1059,11 @@ class Transfer extends Start_Controller {
                 				}
 				 	  	    	else
 				 	  	    	{
-				     	  		    echo json_encode(array('music'=>'1','success'=>true));exit;
+									if($lb['is_jiaji'] == 2){
+										echo json_encode(array('music'=>'1','is_jiaji'=>2,'success'=>true));exit;
+									}else{
+										echo json_encode(array('music'=>'1','success'=>true));exit;
+									}
 				 	  	   		}
 							}
 							else
@@ -1096,7 +1112,11 @@ class Transfer extends Start_Controller {
 				}
 				else
 				{
-					echo json_encode(array('music'=>'1','success'=>true));exit;
+					if($lb['is_jiaji'] == 2){
+						echo json_encode(array('music'=>'1','is_jiaji'=>2,'success'=>true));exit;
+					}else{
+						echo json_encode(array('music'=>'1','success'=>true));exit;
+					}
 				}
 			}
 			else

+ 2 - 2
template/erp/js/print.js

@@ -1618,11 +1618,11 @@ else
     });
 });
 
-function newbbnumberprint(d,n,zps,b,ph) {
+function newbbnumberprint(d,n,zps,b,ph,is_jiaji) {
 	layx.load('loadId','操作中,请稍后',{shadable:0.6});
     $.ajax({
         url: addedit,
-        data: "type=0&data="+d+"&n="+n+"&zps="+zps+"&b="+b+"&ph="+ph,
+        data: "type=0&data="+d+"&n="+n+"&zps="+zps+"&b="+b+"&ph="+ph+"&is_jiaji="+is_jiaji,
         type: "POST",
         dataType: "json",
         success: function(a) {

BIN
template/erp/music/jiaji.mp3


+ 23 - 2
template/erp/transfer_ck.html

@@ -69,6 +69,9 @@
 <audio id="music_print_ok">
 <source src="{$theme}music/print_ok.mp3" type="audio/mpeg">
 </audio>
+<audio id="music_jiaji">
+    <source src="{$theme}music/jiaji.mp3" type="audio/mpeg">
+</audio>
 <script>
 var sysprint = 1;var transfer = 1;
 var dataurl = "/transfer/ck/";var fdataurl = "/transfer/ck/";
@@ -115,10 +118,28 @@ $(document).keyup(function(event) {
                 success: function(b) {
                     $(".systemwindow").hide();
                     if (b && b.success) {
+                        if(b.hasOwnProperty('is_jiaji')){
+                            if(b.is_jiaji == 2){
+                                $("#wigsout").blur();
+                                $("#music_jiaji")[0].play();
+                                $(".express div p:eq(0)").html("此单为加急单、请优先加急生产!");
+                                $(".express div p:eq(1)").html("<font class='esc'>确 定</font>");
+                                $(".express").show();
+                                $("#transferout").val("");
+                                $("#transferout").focus();
+                            }else{
+                                $("#music_d")[0].play();
+                                
+                                $("#transferout").val("");
+                                $("#transferout").focus();
+                            }
+
+                        }else{
                             $("#music_d")[0].play();
                         
-                        $("#transferout").val("");
-                        $("#transferout").focus();
+                            $("#transferout").val("");
+                            $("#transferout").focus();
+                        }
                     } else {
                         $("#wigsout").blur();
                         $("#music_c")[0].play();

+ 26 - 2
template/erp/transfer_rk.html

@@ -69,6 +69,9 @@
 <audio id="music_print_ok">
 <source src="{$theme}music/print_ok.mp3" type="audio/mpeg">
 </audio>
+<audio id="music_jiaji">
+    <source src="{$theme}music/jiaji.mp3" type="audio/mpeg">
+</audio>
 <script>
 var sysprint = 1;var transfer = 1;
 var dataurl = "/transfer/rk/";var fdataurl = "/transfer/rk/";
@@ -115,10 +118,31 @@ $(document).keyup(function(event) {
                 success: function(b) {
                     $(".systemwindow").hide();
                     if (b && b.success) {
+                        
+                        if(b.hasOwnProperty('is_jiaji')){
+                            if(b.is_jiaji == 2){
+                                $("#wigsout").blur();
+                                $("#music_jiaji")[0].play();
+                                $(".express div p:eq(0)").html("此单为加急单、请优先加急生产!");
+                                $(".express div p:eq(1)").html("<font class='esc'>确 定</font>");
+                                $(".express").show();
+                                $("#transferout").val("");
+                                $("#transferout").focus();
+                            }else{
+                                $("#music_d")[0].play();
+                                
+                                $("#transferout").val("");
+                                $("#transferout").focus();
+                            }
+
+                        }else{
                             $("#music_d")[0].play();
                         
-                        $("#transferout").val("");
-                        $("#transferout").focus();
+                            $("#transferout").val("");
+                            $("#transferout").focus();
+                        }
+                        
+                        
                     } else {
                         $("#wigsout").blur();
                         $("#music_c")[0].play();