补货功能导出调整，及点盘页面调整

app/Http/Controllers/ReplenishmentController.php

@@ -51,20 +51,30 @@ class ReplenishmentController extends Controller
             '商品条码',
             '拣货库位',
             '缺货数',
-            '存储库位'
+            '存储库位',
+            '数量',
+            '批次号'
         ];
         $json = [];
 
         foreach ($orders as $order) {
             $eaLocation = '';
-
             $rsLocation = '';
+            $qty = '';
+            $lot = '';
+
             foreach ($order['eaLocation'] as $v) {
-                $eaLocation .= $v . ",\r\n";
+                $eaLocation .= $v . "\r\n";
             }
 
             foreach ($order['rsLocation'] as $v) {
-                $rsLocation .= $v['location'] . '  :'.$v['qty'].",\r\n";
+                $rsLocation .= $v['location'] ."\r\n";
+            }
+            foreach ($order['rsLocation'] as $v) {
+                $qty .= $v['qty'] ."\r\n";
+            }
+            foreach ($order['rsLocation'] as $v) {
+                $lot .= $v['lot'] ."\r\n";
             }
 
             $data = [
@@ -74,6 +84,8 @@ class ReplenishmentController extends Controller
                 $eaLocation,
                 $order['amount'],
                 $rsLocation,
+                $qty,
+                $lot,
             ];
             $json[] = $data;
         }

app/Services/ReplenishmentService.php

@@ -109,7 +109,7 @@ sql;
     {
         $db = DB::connection("oracle");
         $sql = <<<sql
-select INV_LOT_LOC_ID.CUSTOMERID,INV_LOT_LOC_ID.SKU,INV_LOT_LOC_ID.LOCATIONID,sum(INV_LOT_LOC_ID.QTY) qty
+select INV_LOT_LOC_ID.CUSTOMERID,INV_LOT_LOC_ID.SKU,INV_LOT_LOC_ID.LOCATIONID,INV_LOT_LOC_ID.LOTNUM,sum(INV_LOT_LOC_ID.QTY) qty
 from INV_LOT_LOC_ID
          left join BAS_LOCATION on BAS_LOCATION.LOCATIONID = INV_LOT_LOC_ID.LOCATIONID
 where BAS_LOCATION.LOCATIONUSAGE = 'RS'
@@ -126,7 +126,7 @@ sql;
             }
             $sql .= ")";
         }
-        $sql.= ' group by INV_LOT_LOC_ID.CUSTOMERID,INV_LOT_LOC_ID.SKU,INV_LOT_LOC_ID.LOCATIONID order by qty desc';
+        $sql.= ' group by INV_LOT_LOC_ID.CUSTOMERID,INV_LOT_LOC_ID.SKU,INV_LOT_LOC_ID.LOCATIONID,INV_LOT_LOC_ID.LOTNUM order by qty desc';
         $info= $db->select(DB::raw($sql),[$customer]);
         //整合同sku下的存储库位
         $tmpArray = array();
@@ -135,13 +135,13 @@ sql;
             if (array_key_exists($key, $tmpArray)) {
                 if (is_array($tmpArray[$key]['locationid'])) {
                     if (count($tmpArray[$key]['locationid'])<5){
-                        $tmpArray[$key]['locationid'][] = ['location'=>$row->locationid,'qty'=>$row->qty];
+                        $tmpArray[$key]['locationid'][] = ['location'=>$row->locationid,'qty'=>$row->qty,'lot'=>$row->lotnum];
                     }
                 } else {
-                    $tmpArray[$key]['locationid'] = array($tmpArray[$key]['locationid'], ['location'=>$row->locationid,'qty'=>$row->qty]);
+                    $tmpArray[$key]['locationid'] = array($tmpArray[$key]['locationid'], ['location'=>$row->locationid,'qty'=>$row->qty,'lot'=>$row->lotnum]);
                 }
             } else {
-                $tmpArray[$key] = array('sku'=>$row->sku,'locationid'=>array(['location'=>$row->locationid,'qty'=>$row->qty]));
+                $tmpArray[$key] = array('sku'=>$row->sku,'locationid'=>array(['location'=>$row->locationid,'qty'=>$row->qty,'lot'=>$row->lotnum]));
             }
         }
         return $tmpArray;

resources/views/inventory/stockOut/index.blade.php

@@ -39,6 +39,7 @@
                         <ul style="list-style: none">
                             <li v-for="(v,k) in item.rsLocation" v-if="k<3 || item.moreRaLocation">@{{ v.location }}
                                 <span class="font-weight-bold text-dark">&nbsp;&nbsp;&nbsp;:@{{ v.qty }}</span>
+                                <span class="font-weight-bold text-dark">&nbsp;&nbsp;&nbsp;:@{{ v.lot }}</span>
                             </li>
                             <a v-if="item.rsLocation.length >= 3" href="#javascript:;"
                                @click="item.moreRaLocation = !(item.moreRaLocation)">展示更多</a>

resources/views/store/countGoodsAndReceive/index.blade.php

@@ -99,33 +99,40 @@
 
                             <td class="text-center">
                                 <span v-if="goods.basSku.lot_id">
-                                    <input type="date" autocomplete="off" class="form-control form-control-sm input-sm" :class="errors.lotatt01 ? 'is-invalid' : ''"
-                                           :disabled="goods.basSku.lot_id.lotkey01==='N'"  id="lotatt01" v-model="goods.lotatt01">
+                                    <span v-if="goods.basSku.lot_id.lotkey01==='Y'">
+                                        <input type="date" autocomplete="off" class="form-control form-control-sm input-sm" :class="errors.lotatt01 ? 'is-invalid' : ''"
+                                                 id="lotatt01" v-model="goods.lotatt01">
                                      <span class="invalid-feedback offset-3" role="alert" v-if="errors.lotatt01">
                                         <strong>@{{ errors.lotatt01[0] }}</strong>
                                     </span>
+                                    </span>
                                 </span>
                             </td>
                             <td class="text-center">
                                <span v-if="goods.basSku.lot_id">
-                                    <input type="date" autocomplete="off" class="form-control form-control-sm input-sm" :class="errors.lotatt02 ? 'is-invalid' : ''"
-                                           :disabled="goods.basSku.lot_id.lotkey02==='N'"  id="lotatt02" v-model="goods.lotatt02">
+                                   <span v-if="goods.basSku.lot_id.lotkey02==='Y'">
+                                       <input type="date" autocomplete="off" class="form-control form-control-sm input-sm" :class="errors.lotatt02 ? 'is-invalid' : ''"
+                                              id="lotatt02" v-model="goods.lotatt02">
                                     <span class="invalid-feedback offset-3" role="alert" v-if="errors.lotatt02">
                                         <strong>@{{ errors.lotatt02[0] }}</strong>
                                     </span>
+                                   </span>
                                 </span>
                             </td>
                             <td class="text-center">
                                 <span v-if="goods.basSku.lot_id">
+                                    <span v-if="goods.basSku.lot_id.lotkey04==='Y'">
                                     <input type="text" autocomplete="off" class="form-control form-control-sm input-sm" :class="errors.lotatt04 ? 'is-invalid' : ''"
-                                           :disabled="goods.basSku.lot_id.lotkey04==='N'"  id="lotatt04" v-model="goods.lotatt04">
+                                             id="lotatt04" v-model="goods.lotatt04">
                                      <span class="invalid-feedback offset-3" role="alert" v-if="errors.lotatt04">
                                         <strong>@{{ errors.lotatt04[0] }}</strong>
                                     </span>
+                                    </span>
                                 </span>
                             </td>
                             <td class="text-center">
                                 <span v-if="goods.basSku.lot_id">
+                                    <span v-if="goods.basSku.lot_id.lotatt05==='Y'">
                                     <select class="form-control form-control-sm" :disabled="goods.basSku.lot_id.lotkey05==='N'"
                                             id="lotatt05" v-model="goods.lotatt05" :class="errors.lotatt05 ? 'is-invalid' : ''">
                                         <option v-for="(attributeLocation,i) in attributeLocations"
@@ -134,26 +141,31 @@
                                      <span class="invalid-feedback offset-3" role="alert" v-if="errors.lotatt05">
                                         <strong>@{{ errors.lotatt05[0] }}</strong>
                                     </span>
+                                    </span>
                                 </span>
                             </td>
                             <td class="text-center">
                                 <span v-if="goods.basSku.lot_id">
+                                     <span v-if="goods.basSku.lot_id.lotkey08==='Y'">
                                      <select class="form-control form-control-sm" :class="errors.lotatt08 ? 'is-invalid' : ''"
-                                             :disabled="goods.basSku.lot_id.lotkey08==='N'" id="lotatt08" v-model="goods.lotatt08">
+                                              id="lotatt08" v-model="goods.lotatt08">
                                         <option v-for="(quality,i) in qualityStatus"  :value="quality.code">@{{ quality.codename_c }}</option>
                                     </select>
                                      <span class="invalid-feedback offset-3" role="alert" v-if="errors.lotatt08">
                                         <strong>@{{ errors.lotatt08[0] }}</strong>
                                     </span>
+                                     </span>
                                 </span>
                             </td>
                             <td class="text-center">
                                 <span v-if="goods.basSku.lot_id">
+                                    <span v-if="goods.basSku.lot_id.lotkey03==='Y'">
                                     <input type="date" autocomplete="off" class="form-control form-control-sm input-sm" :class="errors.lotatt03 ? 'is-invalid' : ''"
                                            :disabled="goods.basSku.lot_id.lotkey03==='N'"  id="lotatt03" v-model="goods.lotatt03">
                                      <span class="invalid-feedback offset-3" role="alert" v-if="errors.lotatt03">
                                         <strong>@{{ errors.lotatt03[0] }}</strong>
                                     </span>
+                                    </span>
                                 </span>
                             </td>
                             <td class="text-center">