德邦打印

app/Http/Controllers/ControlPanelController.php

@@ -145,8 +145,13 @@ class ControlPanelController extends Controller
             foreach (CarbonPeriod::create($start,$end) as $date){
                 /** @var $date Carbon */
                 $str = $date->format("Y-m-d");
-                $data[] = $this->getTargetData($str, $owner);
-                $title[] = $str;
+                if (strtotime($str) <= strtotime(now())){
+                    $arr = $this->getTargetData($str, $owner);
+                    if ($arr) {
+                        $data[] = $arr;
+                        $title[] = $str;
+                    }
+                }
             }
             $start = date('Y-m-d', strtotime($start));
         }

app/Services/DbOpenService.php

@@ -139,12 +139,12 @@ class DbOpenService
             'isdispatched'  => '',
             'ispresaleorder'=> '',
             'isCenterDelivery' => '',
-            'orderExtendFields' => [
-                'value'     => '',
-                'key'       => ''
-            ]
+//            'orderExtendFields' => [
+//                'value'     => '',
+//                'key'       => ''
+//            ]
         ];
-        $param = json_encode($data,1);
+        $param = json_encode($data);
         $timestamp = (integer)getMillisecond();
         return ["params"=>$param,"timestamp"=>$timestamp,
             "digest"=>base64_encode(md5($param.config('api_logistic.DB.prod.app_key').$timestamp)),

config/api_logistic.php

@@ -200,8 +200,8 @@ return [
             'smsNotify' => 'N', //短信通知  Y：需要 N: 不需要
             'passwordSigning' => 'N', //是否口令签收 仅适用于快递，Y：需要 N: 不需要；若为Y，必须收货人提供验证码给快递员才能签收，该服务是有偿的，具体费用请让我司收货营业部联系张宁（491407），请慎重使用！
             'uri' => [
-                'create_order' => 'http://dpsanbox.deppon.com/sandbox-web/dop-standard-ewborder/createOrderNotify.action',
-                'order_locus' => 'http://dpsanbox.deppon.com/sandbox-web/standard-order/newTraceQuery.action',
+                'create_order' => 'http://gwapi.deppon.com/dop-interface-async/standard-order/createOrderNotify.action',
+                'order_locus' => 'http://dpapi.deppon.com/dop-interface-sync/standard-query/newTraceQuery.action',
             ]
         ]
     ],

resources/js/lodop/myPrintKit.js

@@ -264,7 +264,7 @@ function printTest(items ='') {
         printOrder.totalCharge = item.charge;
         printOrder.insuranceMoney = 0; //保价
         printOrder.signSheet = item.back_sign_bill ? (item.back_sign_bill == 1 ? '签收单原件返回' : '电子签收单' ) : '无需返单';
-        printOrder.outerField1 = ''; //受理部门
+        printOrder.outerField1 = '上海松江区泗泾泗砖公路营业部'; //受理部门
         printOrder.lastOutLoadOrgName = item.arrived_org_simple_name??'';  //最终外场
         printOrder.departCityName = '上海市'; //原寄地
         printOrder.secondLoadOrgName = '';  //第二外场
@@ -276,7 +276,7 @@ function printTest(items ='') {
         printOrder.billTime = item.order.created_at;
         printOrder.cargoCount = item.total_number;
         printOrder.reciveLoanAccount = ''; //代收账号
-        printOrder.printSerialNos = ''; //流水号
+        printOrder.printSerialNos = '0001'; //流水号
         printOrder.isHideWareHouse = '';
         printOrder.originalNumber = '';
         printList.push(printOrder);

resources/views/transport/waybill/edit.blade.php

@@ -95,10 +95,10 @@
                                                name="total_weight" autocomplete="off" v-model="waybill.total_weight" id="total_weight">
                                     </div>
                                     <label for="deliveryType_id" class="col-2 col-form-label text-right text-primary">送货方式 *</label>
-                                    <div class="col-5">
+                                    <div class="col-3">
                                         <select class="form-control @error('deliveryType_id') is-invalid @enderror" name="deliveryType_id"
                                                 :class="errors['deliveryType_id'] ? 'is-invalid' :''"
-                                                style="width: 30%;"   v-model="waybill.deliveryType_id" id="deliveryType_id">
+                                                style="width: 100%;"   v-model="waybill.deliveryType_id" id="deliveryType_id">
                                             <option v-for="deliveryType in deliveryTypes" :value="deliveryType.id">@{{ deliveryType.name }}</option>
                                         </select>
                                     </div>
@@ -128,15 +128,16 @@
                                 </div>
 
                                 <div class="form-group row">
-                                    <label for="" class="col-2 col-form-label text-right text-primary">支付方式 *</label>
+                                    <label for="" class="col-2 col-form-label text-right text-primary">包装方式 *</label>
                                     <div class="col-3">
-                                        <select class="form-control @error('pay_type') is-invalid @enderror" name="pay_type"
-                                                :class="errors['pay_type'] ? 'is-invalid' :''"
-                                                style="width: 100%;"   v-model="waybill.pay_type" id="pay_type">
-                                            <option v-for="(v,k) in payTypes" :value="k">@{{ v }}</option>
+                                        <select class="form-control  @error('package_service') is-invalid @enderror" name="package_service"
+                                                :class="errors['package_service'] ? 'is-invalid' :''"
+                                                style="width: 100%;"   v-model="waybill.package_service" id="package_service">
+                                            <option v-for="(v,k) in packageServices" :value="v">@{{ v }}</option>
                                         </select>
-                                        @error('pay_type')<span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>@enderror
+                                        @error('package_service')<span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>@enderror
                                     </div>
+
                                     <label for="" class="col-2 col-form-label text-right text-primary">签收回单 *</label>
                                     <div class="col-3">
                                         <select class="form-control @error('back_sign_bill') is-invalid @enderror" name="back_sign_bill"
@@ -148,14 +149,14 @@
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label for="" class="col-2 col-form-label text-right text-primary">包装方式 *</label>
-                                    <div class="col-3">
-                                        <select class="form-control  @error('package_service') is-invalid @enderror" name="package_service"
-                                                :class="errors['package_service'] ? 'is-invalid' :''"
-                                                style="width: 100%;"   v-model="waybill.package_service" id="package_service">
-                                            <option v-for="(v,k) in packageServices" :value="v">@{{ v }}</option>
+                                    <label for="" class="col-2 col-form-label text-right text-primary">支付方式 *</label>
+                                    <div class="col-6">
+                                        <select class="form-control @error('pay_type') is-invalid @enderror" name="pay_type"
+                                                :class="errors['pay_type'] ? 'is-invalid' :''"
+                                                style="width: 100%;"   v-model="waybill.pay_type" id="pay_type">
+                                            <option v-for="(v,k) in payTypes" :value="k">@{{ v }}</option>
                                         </select>
-                                        @error('package_service')<span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>@enderror
+                                        @error('pay_type')<span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>@enderror
                                     </div>
                                 </div>
                             </div>
@@ -733,6 +734,14 @@
                         });
                 }
             },
+            created(){
+                this.waybill.deliveryType_id = this.deliveryTypes[2].id;
+                this.waybill.order_type = 2;
+                this.waybill.transport_type = 'JZKH';
+                this.waybill.pay_type = 2;
+                this.waybill.back_sign_bill = 0;
+                this.waybill.package_service = this.packageServices[4];
+            }
         });
     </script>
 @endsection

resources/views/transport/waybill/index.blade.php

@@ -51,11 +51,11 @@
                         title="合并多条运单至一条，已填写信息将被累加处理" @click="waybillMerge()">运单合并</button>
             <button class="btn btn-sm btn-outline-info tooltipTarget"
                     title="将已合并运单拆分返回原状态" @click="waybillSplit()">拆单返回</button>
-                @if($uriType=='' || $uriType=='德邦物流')
-                    <button class="btn btn-sm btn-outline-info tooltipTarget"
-                        title="打印快递面单" @click="expressFaceList()">打印快递面单</button>
-                @endif
             @endcan
+            @if($uriType=='' || $uriType=='德邦物流')
+                <button class="btn btn-sm btn-outline-info tooltipTarget"
+                        title="打印快递面单" @click="expressFaceList()">打印快递面单</button>
+            @endif
             <div>
                 @if(Session::has('successTip'))
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
@@ -1442,6 +1442,7 @@
          */
         function printEWaybill(data, serialNo, barcode, wayNum){
             //打印内容
+            console.log(barcode);
             var printHtml = htmlTemplateObj.find("div#expressPrintArea").html();
 
             LODOP.PRINT_INIT("二级模板");
@@ -1449,8 +1450,11 @@
             LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW", true);
 
             LODOP.ADD_PRINT_TABLE("2mm","0.6mm","95mm","177mm",printHtml);
-            LODOP.ADD_PRINT_BARCODE("79mm","10mm","84mm","15mm","128C", data.waybillNumber);
-            LODOP.ADD_PRINT_BARCODE("117mm","45mm","50mm","8mm","128C", data.waybillNumber);
+            LODOP.ADD_PRINT_BARCODE("79mm","10mm","84mm","15mm","128Auto", barcode);
+            LODOP.ADD_PRINT_BARCODE("117mm","45mm","50mm","8mm","128Auto", barcode);
+
+            //设定固定打印机
+            if(LODOP.SET_PRINTER_INDEX('EK100B'))LODOP.SET_PRINTER_INDEX('EK100B');
 
             //打印
             // LODOP.PREVIEW();