m

app/Http/Controllers/Admin/GoodsController.php

@@ -294,7 +294,7 @@ class GoodsController extends Controller
                 $mjArr['description'] = $goods['description'];
                 $mj = Order::mjGoodsUpdate($mjArr);
 
-                /*
+                
                 //更新erp
                 $erpArr = array();
                 $goodsId = GoodsSkus::where('goodsCode', $id)->where('erpGoodsId','>',0)->first();
@@ -303,7 +303,7 @@ class GoodsController extends Controller
                     $erpArr['goodsName'] = $goods['name'];
                     $mj = Order::mjErpGoodsUpdate($erpArr);
                 }
-                */
+                
 
                 #记录操作日志
                 $self_id = session('admin_id');

resources/views/goods/index.blade.php

@@ -50,7 +50,7 @@
                         <td class="text-c">{{$a['productCode']}}</td>
                         <td class="text-c">
                             @foreach($a['sku_list'] as $item)
-                                规格:{{$item['propsName']}}&nbsp;&nbsp;  价格:{{$item['price']}} &nbsp;&nbsp; 库存:{{$item['quantity']}}  <br>
+                                规格:{{$item['propsName']}}&nbsp;&nbsp;  价格:{{$item['price']}} &nbsp;&nbsp; 库存:{{$item['quantity']}}  @if($item['is_weigh']==1)【称重商品】 @endif <br>
                             @endforeach
                         </td>
                         <td class="text-c">{{$a['description']}}</td>

resources/views/order/ordercreate.blade.php

@@ -138,7 +138,7 @@
                             <option value="0" @if(old('warehouse')=='0') selected @endif>- 请选择 -</option>
                             <option value="1" @if(old('warehouse')=='1') selected @endif>A仓库</option>                            
                             <option value="2" @if(old('warehouse')=='2') selected @endif>B仓库</option>                            
-                            <!--option value="3" @if(old('warehouse')=='3') selected @endif>C仓库</option-->                            
+                            <option value="3" @if(old('warehouse')=='3') selected @endif>C仓库</option>                            
                         </select>
                     </span>
                 </div>

resources/views/order/orderedit.blade.php

@@ -143,7 +143,7 @@
                             <option value="0" @if($order['warehouse']=='0') selected @endif>- 请选择 -</option>
                             <option value="1" @if($order['warehouse']=='1') selected @endif>A仓库</option>                            
                             <option value="2" @if($order['warehouse']=='2') selected @endif>B仓库</option>                            
-                            <!--option value="3" @if($order['warehouse']=='3') selected @endif>C仓库</option-->                            
+                            <option value="3" @if($order['warehouse']=='3') selected @endif>C仓库</option>                            
                         </select>
                     </span>
                 </div>