|
@@ -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
|