修改翔文合并订单出库的异常 因为翔文仓就不占单

core/CoreApp/controllers/Systemfout.php

@@ -842,11 +842,20 @@ class Systemfout extends Start_Controller {
 				$vshop = $this->shop->read($v['shop']);
 				$vwarehouse = $this->warehouse->read($v['type']);
 				$this->$fullorder_name->save($post,$v['id']);
-				$wh = $this->_fout_db($v,$warehouse,$bdck);
-				foreach ($wh['sj'] as $vv)
-		        {
-					$this->$bdck->save(array('state'=>1,'cktype'=>1,'orderinfo'=>$v['orderinfo'],'waybill'=>$y['waybill'],'outk'=>$time,'time'=>$time),$vv['id']);
+				//2025年1月25日发现翔文合并订单发现此问题
+				if($warehouse['zd'] == '1'){
+					$wh = $this->_fout_db($v,$warehouse,$bdck);
+					foreach ($wh['sj'] as $vv)
+					{
+						$this->$bdck->save(array('state'=>1,'cktype'=>1,'orderinfo'=>$v['orderinfo'],'waybill'=>$y['waybill'],'outk'=>$time,'time'=>$time),$vv['id']);
+					}
 				}
+				
+				// $wh = $this->_fout_db($v,$warehouse,$bdck);
+				// foreach ($wh['sj'] as $vv)
+		  //      {
+				// 	$this->$bdck->save(array('state'=>1,'cktype'=>1,'orderinfo'=>$v['orderinfo'],'waybill'=>$y['waybill'],'outk'=>$time,'time'=>$time),$vv['id']);
+				// }
 				//$this->ck->get_kc($post['state'],$vwarehouse,$vshop,$v['number'],$v['whlabel'],$v['fpdata']);
 			}
 			if ($this->db->trans_status() === TRUE)