lvhao 3 hari lalu
induk
melakukan
97499a2f94

+ 16 - 3
core/CoreApp/controllers/Beihuogl.php

@@ -961,7 +961,7 @@ class Beihuogl extends Start_Controller {
                     $str .=  "</div>";
                     $str .=  "</div>";
 
 
                 }
                 }
-                if($v['ck_status'] == 1){
+                if($v['ck_status'] == 1 || $v['ck_status'] == 2){
                     $str .=  "<div style='text-align:center;'>";
                     $str .=  "<div style='text-align:center;'>";
                     $str .= "<a href='javascript:void(0)' class='window' data-h='/beihuogl/makeu9scd/".$v['id']."' data-t='修改'  style='margin-right:4px;color: #fff;background-color:#0099FF;padding:4px 10px;border-radius:5px;font-size:15px' >生成u9生产单</a>";
                     $str .= "<a href='javascript:void(0)' class='window' data-h='/beihuogl/makeu9scd/".$v['id']."' data-t='修改'  style='margin-right:4px;color: #fff;background-color:#0099FF;padding:4px 10px;border-radius:5px;font-size:15px' >生成u9生产单</a>";
                     $str .=  "</div>";
                     $str .=  "</div>";
@@ -1104,9 +1104,15 @@ class Beihuogl extends Start_Controller {
                 echo json_encode(['success'=>false,'msg'=>'生成u9生产单失败']);exit;
                 echo json_encode(['success'=>false,'msg'=>'生成u9生产单失败']);exit;
             }
             }
             if(($u9sc_status < $len) && ( $flag_status< $len) ){
             if(($u9sc_status < $len) && ( $flag_status< $len) ){
+                $this->bhccwl->save([
+                    'ck_status'=>2,
+                ],$info['id']);
                 echo json_encode(['success'=>true,'msg'=>'生成u9生产单部分成功']);exit;
                 echo json_encode(['success'=>true,'msg'=>'生成u9生产单部分成功']);exit;
             }
             }
             if($u9sc_status == $len){
             if($u9sc_status == $len){
+                $this->bhccwl->save([
+                    'ck_status'=>3,
+                ],$info['id']);
                 echo json_encode(['success'=>true,'msg'=>'生成u9生产单成功']);exit;
                 echo json_encode(['success'=>true,'msg'=>'生成u9生产单成功']);exit;
             }
             }
             echo json_encode(['success'=>false,'msg'=>'代码异常']);exit;
             echo json_encode(['success'=>false,'msg'=>'代码异常']);exit;
@@ -1178,7 +1184,7 @@ class Beihuogl extends Start_Controller {
                     'is_u9sc'=>1,
                     'is_u9sc'=>1,
                     'u9sc_no'=>$res[0]['Data'][0]['m_code'],
                     'u9sc_no'=>$res[0]['Data'][0]['m_code'],
                 ],$bhsq_info['id']);
                 ],$bhsq_info['id']);
-                $tmp_list = $this->bhsq->find_all("bh_no = '".$info['bh_no']."' and  is_u9sc = 0 ");
+                $tmp_list = $this->bhsq->find_all("bh_no = '".$bh_no."' and  is_u9sc = 0 ");
                 if(empty($tmp_list)){
                 if(empty($tmp_list)){
                     $tmp_status = 3;
                     $tmp_status = 3;
                 }else{
                 }else{
@@ -1189,8 +1195,13 @@ class Beihuogl extends Start_Controller {
                 ],$bhccwl_info['id']);
                 ],$bhccwl_info['id']);
                 echo json_encode(['success'=>true,'msg'=>'生成u9生产单成功']);exit;
                 echo json_encode(['success'=>true,'msg'=>'生成u9生产单成功']);exit;
             }else{
             }else{
-
+                $this->bhsq->save([
+                    'u9sc_remark'=>$res[0]['Data'][0]['m_errorMsg'],
+                ],$bhsq_info['id']);
+                echo json_encode(['success'=>false,'msg'=>$res[0]['Data'][0]["m_errorMsg"]]);exit;
             }
             }
+            
+            
 
 
         }else{
         }else{
             exit('No direct script access allowed');
             exit('No direct script access allowed');
@@ -1207,12 +1218,14 @@ class Beihuogl extends Start_Controller {
         $shop_list = array_column($shop_list,'shopname','id');
         $shop_list = array_column($shop_list,'shopname','id');
         $info = $this->bhccwl->read($id);
         $info = $this->bhccwl->read($id);
         $list = $this->bhsq->find_all("bh_no = '".$info['bh_no']."' ");
         $list = $this->bhsq->find_all("bh_no = '".$info['bh_no']."' ");
+        $list_dcd = $this->bhdcd->find_all("bh_no = '".$info['bh_no']."' ");
         foreach($list as $k=>$v){
         foreach($list as $k=>$v){
             $list[$k]['shop_id'] = isset($shop_list[$v['shop_id']])?$shop_list[$v['shop_id']]:"";
             $list[$k]['shop_id'] = isset($shop_list[$v['shop_id']])?$shop_list[$v['shop_id']]:"";
             $list[$k]['drck_show'] = isset($drck_list[$v['drck']])?$drck_list[$v['drck']]:"";
             $list[$k]['drck_show'] = isset($drck_list[$v['drck']])?$drck_list[$v['drck']]:"";
         }
         }
         $this->data['info'] = $info;
         $this->data['info'] = $info;
         $this->data['list'] = $list;
         $this->data['list'] = $list;
+        $this->data['list_dcd'] = $list_dcd;
         $this->_Template('beihuogl_showckbh',$this->data);
         $this->_Template('beihuogl_showckbh',$this->data);
     }
     }
     //仓库录入调出单
     //仓库录入调出单

+ 11 - 3
template/erp/beihuogl_makeu9scd.html

@@ -176,7 +176,7 @@
 </ul>
 </ul>
 <input  type="hidden" name="id" value="{$info['id']}" />
 <input  type="hidden" name="id" value="{$info['id']}" />
 <div class="button">
 <div class="button">
-    {if $info['ck_status'] > 2}
+    {if $info['ck_status'] == 1}
     <font class="datasave">创建生产单(全部)</font> 
     <font class="datasave">创建生产单(全部)</font> 
     {/if}
     {/if}
     <font class="fh">关 闭</font>
     <font class="fh">关 闭</font>
@@ -194,9 +194,17 @@ var addedit="/beihuogl/makeu9scd/";
 function ddscscd(that){
 function ddscscd(that){
     var id=$(that).attr('data-id');
     var id=$(that).attr('data-id');
     var bh_no=$(that).attr('data-bh_no');
     var bh_no=$(that).attr('data-bh_no');
-    location.reload()
+    
     $.post("/beihuogl/ddscscd",{id:id,bh_no:bh_no},function(a){
     $.post("/beihuogl/ddscscd",{id:id,bh_no:bh_no},function(a){
-
+        if(a.success){
+            location.reload();
+        }else{
+            layx.msg(a.msg, {
+                dialogIcon: 'warn',
+                position: 'cc'
+            });
+           return  ;
+        }
     },"json")
     },"json")
    
    
 }
 }

+ 6 - 7
template/erp/beihuogl_showckbh.html

@@ -180,26 +180,25 @@
         <!-- 简约表头:含必要列,其中包含两个输入域列 -->
         <!-- 简约表头:含必要列,其中包含两个输入域列 -->
         <thead>
         <thead>
             <tr>
             <tr>
-                <th>调出仓库</th>
+                <th>u9料号</th>
                 <th>调出单号</th>
                 <th>调出单号</th>
                 <th>调入单号</th>
                 <th>调入单号</th>
-                <th>调入总数</th>
-                <th>详情</th>
+                <th>调出单数</th>
             </tr>
             </tr>
         </thead>
         </thead>
         <tbody id="goodsList">
         <tbody id="goodsList">
-            {loop $list as $good}
+            {loop $list_dcd as $good}
             <tr>
             <tr>
                 <input type="hidden" name="arr_id[]" value="{$good['id']}" />
                 <input type="hidden" name="arr_id[]" value="{$good['id']}" />
                 <td>{$good['jm']}  </td>
                 <td>{$good['jm']}  </td>
                 <td> 
                 <td> 
-                    {$good['ccwl_num']}
+                    {$good['dcd_no']}
                 </td>
                 </td>
                 <td> 
                 <td> 
-                    {$good['u9sc_no']}
+                    {$good['drd_no']}
                 </td>
                 </td>
                 <td>
                 <td>
-                    {$good['drck_show']}
+                    {$good['num']}
                 </td>
                 </td>
                 
                 
             </tr>
             </tr>