From 1e955583470b47f7636eaba800c52c258ac24296 Mon Sep 17 00:00:00 2001
From: wanglizhong <wlz>
Date: 星期一, 28 四月 2025 21:26:10 +0800
Subject: [PATCH] fix:将开单人跟单人放到服务单中
---
Report_DispatchDetailed_Data.php | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Report_DispatchDetailed_Data.php b/Report_DispatchDetailed_Data.php
index c44f2d0..aa4a10a 100644
--- a/Report_DispatchDetailed_Data.php
+++ b/Report_DispatchDetailed_Data.php
@@ -327,15 +327,15 @@
/**
* 鏍规嵁 DispatchOrdID 鏌ユ壘寮�鍗曚汉鍙婅窡鍗曚汉鍒楄〃
*
- * @param int $DispatchOrdID 璋冨害鍗� ID
+ * @param int $ServiceOrdID 璋冨害鍗� ID
* @param object $conn 鏁版嵁搴撹繛鎺ュ璞�
* @return array 鍖呭惈寮�鍗曚汉鍙婅窡鍗曚汉淇℃伅鐨勬暟缁�
*/
-function getDispatchOrderStaff($DispatchOrdID, $conn) {
+function getDispatchOrderStaff($ServiceOrdID, $conn) {
$staffList = [];
// 鏌ヨ寮�鍗曚汉淇℃伅
- $sqlDispatcher = "select PersonName,CommissionRatio from ServiceOrderCommissionDetails where ServiceOrderID='$DispatchOrdID' and PersonType='Opener'";
+ $sqlDispatcher = "select PersonName,CommissionRatio from ServiceOrderCommissionDetails where ServiceOrderID='$ServiceOrdID' and PersonType='Opener'";
$dataDispatcher = sqlsrv_query($conn, $sqlDispatcher);
if ($dataDispatcher && sqlsrv_has_rows($dataDispatcher)) {
@@ -345,7 +345,7 @@
}
// 鏌ヨ璺熷崟浜哄垪琛�
- $sqlEntourage = "select PersonName,CommissionRatio from ServiceOrderCommissionDetails where ServiceOrderID='$DispatchOrdID' and PersonType='Follower'";
+ $sqlEntourage = "select PersonName,CommissionRatio from ServiceOrderCommissionDetails where ServiceOrderID='$ServiceOrdID' and PersonType='Follower'";
$dataEntourage = sqlsrv_query($conn, $sqlEntourage);
if ($dataEntourage) {
$entourageList = [];
@@ -381,7 +381,7 @@
if($data == true){
$FormArray=array();
//琛ㄥご
- $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
+ $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
if ($is_CSV==1){array_push($FormArray[0],"浠诲姟澶囨敞");}
$FormArrayX=count($FormArray[0]);
if (sqlsrv_rows_affected($data)==0) {
@@ -401,11 +401,11 @@
$isRespirator="鏄�";
}
//璇诲彇鏁版嵁--End
-
+ $ServiceOrdID=$rs['ServiceOrdID'];
//鍐欏叆鏁扮粍
$FormArray[$i][0]=$i+(($page-1)*$page_size);
If ($OrdType=="2") {
- $FormArray[$i][1]="<a href='ServiceOrder.gds?ServiceOrdID=".$rs['ServiceOrdID']."&OrdDateType=4&OrdClassList=&h_menu1_1=1' target='_blank'>".$rs['ServiceOrdNo']."</a>";
+ $FormArray[$i][1]="<a href='ServiceOrder.gds?ServiceOrdID=".$ServiceOrdID."&OrdDateType=4&OrdClassList=&h_menu1_1=1' target='_blank'>".$rs['ServiceOrdNo']."</a>";
if (!empty($rs['DispatchOrdNo'])) {
$FormArray[$i][2]="<a href='DispatchOrder.gds?DispatchOrdID=".$rs['DispatchOrdID']."&OrdDateType=4&OrdClassList=&h_menu1_1=1' target='_blank'>".$rs['DispatchOrdNo']."</a>";
}else{
@@ -522,7 +522,7 @@
$FormArray[$i][48]=$rs['EntourageName'];
$FormArray[$i][49]=$rs['EntouragePost'];
$FormArray[$i][50]=$rs['Stime2'];
- $rs2=getDispatchOrderStaff($rs['DispatchOrdID'], $conn);
+ $rs2=getDispatchOrderStaff($ServiceOrdID, $conn);
//濡傛灉 $rs2 涓虹┖锛岃缃粯璁ゅ��
if (empty($rs2)) {
$FormArray[$i][51]='--';
@@ -541,9 +541,9 @@
$FormArray[$i][54+$j]=$value['FollowerRatio'];
$j++;
}
- if($count<3){
- //琛ヨ冻3涓�
- while($j<3){
+ if($count<4){
+ //琛ヨ冻4涓�
+ while($j<4){
$FormArray[$i][53+$j*2]='--';
$FormArray[$i][54+$j*2]='';
$j++;
@@ -556,8 +556,10 @@
$FormArray[$i][56]='';
$FormArray[$i][57]='--';
$FormArray[$i][58]='';
+ $FormArray[$i][59]='--';
+ $FormArray[$i][60]='';
}
- if ($is_CSV==1){$FormArray[$i][59]=$rs['ServiceOrdTaskRemarks'];}
+ if ($is_CSV==1){$FormArray[$i][61]=$rs['ServiceOrdTaskRemarks'];}
$i++;
//鍐欏叆鏁扮粍--End
--
Gitblit v1.9.1