Merge remote-tracking branch 'origin/develop' into develop

tongzhonghao
2 parents 5c5d49a9 62362bcc
Showing 20 changed files with 181 additions and 201 deletions
src/main/java/com/huaheng/pc/vehicle/vehicleReceipt/controller/VehicelReceiptController.java
src/main/java/com/huaheng/pc/vehicle/vehicleShipment/controller/VehicelShipmentController.java
src/main/resources/templates/barcode/barCodeDetail/add.html
src/main/resources/templates/barcode/barCodeDetail/edit.html
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
src/main/resources/templates/main.html
src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
src/main/resources/templates/receipt/receiving/receiving-.html
src/main/resources/templates/receipt/receiving/receiving.html
src/main/resources/templates/shipment/shipmentDetail/edit.html
src/main/resources/templates/shipment/shipmentDetail/shipmentDetail.html
src/main/resources/templates/shipment/shipmentDetailHistory/shipmentDetailHistory.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
src/main/resources/templates/shipment/shippingCombination/combination.html
src/main/resources/templates/task/taskHeader/taskHeader.html
src/main/resources/templates/vehicle/vehicleReceipt/vehicleReceipt.html
src/main/resources/templates/vehicle/vehicleShipment/gemVehicleShipment.html
src/main/resources/templates/vehicle/vehicleShipment/vehicleShipment.html
@@ -15,6 +15,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
 import com.huaheng.pc.vehicle.vehicleReceipt.service.VehicleReceiptService;
 import io.swagger.annotations.Api;
@@ -85,6 +86,8 @@ public class VehicelReceiptController extends BaseController {
                 .in(StringUtils.isNotEmpty(vehicleReceipt.getCompanyCode()),VehicleReceipt::getCompanyCode, vehicleReceipt.getCompanyCode())
                 .in(StringUtils.isEmpty(vehicleReceipt.getCompanyCode()), VehicleReceipt::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 .eq(VehicleReceipt::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .gt(StringUtils.isNotEmpty(createdBegin), VehicleReceipt::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), VehicleReceipt::getCreated, createdEnd)
                 .eq(StringUtils.isNotEmpty(vehicleReceipt.getType()), VehicleReceipt::getType, vehicleReceipt.getType())
                 .eq(StringUtils.isNotEmpty(vehicleReceipt.getMaterialBatch()), VehicleReceipt::getMaterialBatch, vehicleReceipt.getMaterialBatch())
                 .orderByDesc(VehicleReceipt::getCreated);
@@ -15,6 +15,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
 import com.huaheng.pc.vehicle.vehicleShipment.domain.VehicleShipment;
 import com.huaheng.pc.vehicle.vehicleShipment.service.VehicleShipmentService;
@@ -80,6 +81,8 @@ public class VehicelShipmentController extends BaseController {
                 .in(StringUtils.isNotEmpty(vehicleShipment.getCompanyCode()),VehicleShipment::getCompanyCode, vehicleShipment.getCompanyCode())
                 .in(StringUtils.isEmpty(vehicleShipment.getCompanyCode()), VehicleShipment::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 .eq(VehicleShipment::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .gt(StringUtils.isNotEmpty(createdBegin), VehicleShipment::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), VehicleShipment::getCreated, createdEnd)
                 .eq(StringUtils.isNotEmpty(vehicleShipment.getType()),
                         VehicleShipment::getType, vehicleShipment.getType())
                 .orderByDesc(VehicleShipment::getCreated);
@@ -46,12 +46,12 @@
                 <!--<input id="supplierCode" name="supplierCode" class="form-control" type="text">-->
             <!--</div>-->
         <!--</div>-->
-        <div class="form-group">
-            <label class="col-sm-3 control-label">批次：</label>
-            <div class="col-sm-8">
-                <input id="batch" name="batch" class="form-control" type="text">
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">批次：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="batch" name="batch" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
         <!--<div class="form-group">
             <label class="col-sm-3 control-label">电池包种类：</label>
             <div class="col-sm-8">
@@ -41,12 +41,12 @@
                 <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">批次：</label>
-            <div class="col-sm-8">
-                <input id="batch" name="batch" class="form-control" type="text" th:field="*{batch}">
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">批次：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="batch" name="batch" class="form-control" type="text" th:field="*{batch}">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">白班夜班：</label>
             <div class="col-sm-8">
@@ -368,18 +368,6 @@
                 visible: false
             },
             {
-                field : 'code',
-                title : '子条码'
-            },
-            {
-                field : 'receiptCode',
-                title : '入库单编码'
-            },
-            {
-                field : 'weight',
-                title : '拆解托盘总重量'
-            },
-            {
                 field : 'totalQty',
                 title : '数量'
             },
@@ -400,6 +388,11 @@
                 title : '物料单位'
             },
             {
+                field : 'weight',
+                title : '拆解托盘总重量kg'
+            },
+
+            {
                 field : 'regenerationCode',
                 title : '再生编号'
             },
@@ -411,6 +404,15 @@
                 }
             },
             {
+                field : 'code',
+                title : '子条码'
+            },
+            {
+                field : 'receiptCode',
+                title : '入库单编码'
+            },
+
+            {
                 field : 'sn',
                 title : '序列号'
             },
@@ -418,10 +420,10 @@
                 field : 'qty',
                 title : '数量'
             },*/
-            {
-                field : 'batch',
-                title : '批次'
-            },
+            // {
+            //     field : 'batch',
+            //     title : '批次'
+            // },
             {
                 field : 'created',
                 title : '创建时间'
@@ -275,15 +275,15 @@
                 },
                 {
                     field : 'materialGrossWeight',
-                    title : '电池毛重' ,
+                    title : '电池毛重(kg)' ,
                 },
                 {
                     field : 'materialTareWeight',
-                    title : '电池皮重' ,
+                    title : '电池皮重(kg)' ,
                 },
                 {
                     field : 'materialNetWeight',
-                    title : '电池净重' ,
+                    title : '电池净重(kg)' ,
                 },
                 {
                     field : 'countryCode',
@@ -63,7 +63,7 @@
 </div>
 </div>
-<div class="row" style="padding:0 30px;">
+<div class="row" style="padding:0 17px;">
     <div class="col-sm-6" style="padding:5px 5px 10px 5px;">
         <div class="float-e-margins">
             <div class="ibox-title"><h5>历史每日收发货量</h5></div>
@@ -76,9 +76,9 @@
     </div>
     <div class="col-sm-6" style="padding:5px 5px 10px 5px;">
         <div class="float-e-margins">
-            <div class="ibox-title"><h5>库位利用率</h5></div>
+            <div class="ibox-title"><h5>库存概况</h5></div>
             <div class="ibox-content">
-                <div id="chart2" class="flot-chart1">
+                <div id="chart4" class="flot-chart1">
                     这里放图表
                 </div>
             </div>
@@ -96,9 +96,9 @@
     </div>
     <div class="col-sm-6" style="padding:5px 5px 10px 5px;">
         <div class="ibox float-e-margins">
-            <div class="ibox-title"><h5>库存概况</h5></div>
+            <div class="ibox-title"><h5>库位利用率</h5></div>
             <div class="ibox-content">
-                <div id="chart4" class="flot-chart1">
+                <div id="chart2" class="flot-chart1">
                     这里放图表
                 </div>
             </div>
@@ -13,9 +13,9 @@
                         <li>
                             物料编码：<input type="text" name="materialCode"/>
                         </li>
-                        <li>
-                            物料批次：<input type="text" name="batch"/>
-                        </li>
+<!--                        <li>-->
+<!--                            物料批次：<input type="text" name="batch"/>-->
+<!--                        </li>-->
                         <!--<li class="time">-->
                         <!--<label>创建时间： </label>-->
                         <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>-->
@@ -123,10 +123,10 @@
                     field : 'supplierCode',
                     title : '供应商编码'
                 },
-                {
-                    field : 'batch',
-                    title : '批次'
-                },
+                // {
+                //     field : 'batch',
+                //     title : '批次'
+                // },
                 {
                     field : 'lot',
                     title : '批号' ,
@@ -614,15 +614,15 @@
             },
             {
                 field : 'tareWeight',
-                title : '皮重'
+                title : '皮重(kg)'
             },
             {
                 field : 'netWeight',
-                title : '净重'
+                title : '净重(kg)'
             },
             {
                 field : 'grossWeight',
-                title : '毛重'
+                title : '毛重(kg)'
             },
             {
                 field : 'materialUnit',
@@ -98,6 +98,13 @@
 			<ul class="select-list">
 				<input type="text" id="materialCode" hidden/>
 				<li style="display: none">id：<input type="text" id="detailId"/></li>
+				<!--<select id="area" name="batteryType" class="form-control" type="text">
+					<option value="1">库区A</option>
+					<option value="2">库区B</option>
+					<option value="3">库区C</option>
+					<option value="4">库区D</option>
+					<option value="5">库区E</option>
+				</select>-->
 				<li >收货数量：<input type="text" id="receiveNum"/></li>
 				<!--				<li>收货重量：<input type="text" id="receiveWeight"/></li>-->
 				<li hidden>容器编号：<input type="text" id="containerCode"/></li>
@@ -48,7 +48,7 @@
 	}
 	.table-striped-left .select-list li{
 		width:47%;
-		float:left;
+		float:right;
 	}
 	.select-list li select {
@@ -121,56 +121,43 @@
 				</li>
 				<div id="batteryHidden" hidden>
-					<li ><span class="selectClass">电池包类型:</span>
+					<li ><span class="selectClass">电池包类型：</span>
 						<select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}" placeholder="电池类必填">
 							<option value="">--请选择--</option>
 							<option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 					</li>
 					<li >
-						<span class="selectClass">电池类型:</span>
-						<select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryTypes=${@dict.getType('batteryTypes')}">
-							<option value="">--请选择--</option>
-							<option th:each="dict : ${batteryTypes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
-						</select>
-					</li>
-					<li >
-						<span class="selectClass">完整程度:</span>
-						<select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}">
+						<span class="selectClass">质量入库：</span>
+						<select id="receiptScenes" name="receiptScenes" class="form-control" th:with="receiptScenes=${@dict.getType('receiptScenes')}">
 							<option value="">--请选择--</option>
-							<option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+							<option th:each="dict : ${receiptScenes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 					</li>
 					<li >
-						<span class="selectClass">利用类型:</span>
-						<select id="storageType" name="storageType" class="form-control" placeholder="电池类必填">
+						<span class="selectClass">电&nbsp;池&nbsp;类&nbsp;型：</span>
+						<select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryTypes=${@dict.getType('batteryTypes')}">
 							<option value="">--请选择--</option>
-							<option value="0">再生利用</option>
-							<option value="1">梯次利用</option>
+							<option th:each="dict : ${batteryTypes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 					</li>
 					<li >
-						<span class="selectClass">再生利用类型:</span>
-						<select id="type" name="type" class="form-control" placeholder="电池类必填">
+						<span class="selectClass">完整程度：</span>
+						<select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}">
 							<option value="">--请选择--</option>
-							<option value="1">废旧动力蓄电池</option>
-							<option value="2">次品动力蓄电池</option>
-							<option value="3">其他领域废旧电池</option>
+							<option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 					</li>
-					<li>回收人：<select type="text"  id="recycler"  th:with="completeness=${@UserServiceImpl.getRecover()}">
+					<li>回&nbsp;&nbsp;&nbsp;收&nbsp;&nbsp;&nbsp;人&nbsp;&nbsp;：<select type="text"  id="recycler"  th:with="completeness=${@UserServiceImpl.getRecover()}">
 						<option th:each="dict : ${completeness}" th:text="${dict.userName}" th:value="${dict.userName}"></option>
 					</select></li>
-					<li>电量：<input type="text"  id="electricQuantity" placeholder="电池类必填"/></li>
-					<li>皮重：<input type="text"  id="materialTareWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
-					<li>毛重：<input type="text"  id="materialGrossWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
-					<li>净重：<input type="text"  id="materialNetWeight"/></li>
+					<li>毛&nbsp;重(kg)：<input type="text"  id="materialGrossWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
+					<li>皮&nbsp;&nbsp;&nbsp;重&nbsp;&nbsp;(kg)：<input type="text"  id="materialTareWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
+					<li>电&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量：<input type="text"  id="electricQuantity" placeholder="电池类必填"/></li>
+					<li>净&nbsp;&nbsp;&nbsp;重&nbsp;&nbsp;(kg)：<input type="text"  id="materialNetWeight"/></li>
 					<!--<li>回收人：<input type="text"  id="recycler"/></li>-->
 					<li>国家编码：<input type="text" id="countryCode" placeholder="请用pda扫码获取"/></li>
-					<li>备注：<input type="text" id="remark" placeholder="备注"/></li>
-					<!--<li>
-
-					</li>-->
+					<li>电池包备注：<textarea style="height: 80px;width: 200px" id="remark" placeholder="备注"></textarea></li>
 					<li><div class="form-group" style="width:80%;white-space: nowrap">
 						<img id="camera" name="camera" src="" width="250px" height="200px"/>
 						<button id="plc" name="plc" class="btn btn-danger btn-sm" type="button">电池拍照</button>
@@ -658,15 +645,15 @@
 			},
 			{
 				field : 'materialGrossWeight',
-				title : '电池毛重' ,
+				title : '电池毛重(kg)' ,
 			},
 			{
 				field : 'materialTareWeight',
-				title : '电池皮重' ,
+				title : '电池皮重(kg)' ,
 			},
 			{
 				field : 'materialNetWeight',
-				title : '电池净重' ,
+				title : '电池净重(kg)' ,
 			},
 			{
 				field : 'remark',
@@ -31,12 +31,12 @@
                 </div>
             </div>
-            <div class="form-group"  th:if="false">
-            <label class="col-sm-3 control-label">批次：</label>
-                <div class="col-sm-8">
-                    <input id="batch" name="batch" th:field="*{batch}" class="form-control" type="text">
-                </div>
-            </div>
+<!--            <div class="form-group"  th:if="false">-->
+<!--            <label class="col-sm-3 control-label">批次：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <input id="batch" name="batch" th:field="*{batch}" class="form-control" type="text">-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="form-group"  th:if="false">
             <label class="col-sm-3 control-label">批号：</label>
                 <div class="col-sm-8">
@@ -52,15 +52,15 @@
 				},
 				{
 					field : 'netWeight',
-					title : '净重'
+					title : '净重(kg)'
 				},
 				{
 					field : 'tareWeight',
-					title : '皮重'
+					title : '皮重(kg)'
 				},
 				{
 					field : 'grossWeight',
-					title : '毛重'
+					title : '毛重(kg)'
 				},
 					{
 					field : 'sourceLine', 
@@ -72,10 +72,10 @@
 					field : 'materialCode', 
 					title : '物料编码'
 				},
-				{
-					field : 'batch', 
-					title : '批次' 
-				},
+				// {
+				// 	field : 'batch',
+				// 	title : '批次'
+				// },
 				{
 					field : 'lot', 
 					title : '批号' 
@@ -541,15 +541,15 @@
                 },
                 {
                     field: 'grossWeight',
-                    title: '毛重',
+                    title: '毛重(kg)',
                 },
                 {
                     field: 'tareWeight',
-                    title: '皮重',
+                    title: '皮重(kg)',
                 },
                 {
                     field: 'netWeight',
-                    title: '净重',
+                    title: '净重(kg)',
                 },
                 {
                     field: 'poundNumber',
@@ -209,10 +209,10 @@
                     field : 'receiptDetailId',
                     title : '入库单明细id'
                 },
-                {
-                    field : 'batch',
-                    title : '批次'
-                },
+                // {
+                //     field : 'batch',
+                //     title : '批次'
+                // },
                 {
                     field : 'lot',
                     title : '批号'
@@ -456,15 +456,15 @@
 			},
 			{
 				field : 'materialGrossWeight',
-				title : '电池毛重' ,
+				title : '电池毛重(kg)' ,
 			},
 			{
 				field : 'materialTareWeight',
-				title : '电池皮重' ,
+				title : '电池皮重(kg)' ,
 			},
 			{
 				field : 'materialNetWeight',
-				title : '电池净重' ,
+				title : '电池净重(kg)' ,
 			},
 			{
 				field : 'remark',
@@ -30,6 +30,12 @@
                         <li>
                             身份证号：<input type="text" name="cardNumber"/>
                         </li>
+                        <li class="time" style="height: 30px">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -72,6 +78,7 @@
     var prefix = ctx + "vehicle/vehicleReceipt";
     var userDef2 = [[${@dict.getType('probablyMaterial')}]];
     var vehicleDocumentType = [[${@dict.getType('vehicleDocumentType')}]];
+    var supplier =[[${@SupplierService.getCode()}]];
     // var datas = [[${@dict.getType('sys_normal_disable')}]];
     $(function() {
@@ -97,8 +104,8 @@
                 },
                 {
                     field : 'id',
-                    title : '车辆入库id',
-                    sortable:true
+                    title : 'id',
+                    // sortable:true
                 },
                 {
                     field : 'materialBatch',
@@ -106,7 +113,8 @@
                 },
                 {
                     field : 'vehicleType',
-                    title : '单据类型'
+                    title : '单据类型',
+                    visible: false
                 },
                 {
                     field : 'vehicleDocumentType',
@@ -115,30 +123,27 @@
                         return $.table.selectDictLabel(vehicleDocumentType, value);
                     }
                 },
-                // {
-                //     field : 'meterialName',
-                //     title : '物料名称'
-                // },
                 {
-                    field : 'grossWeight',
-                    title : '毛重'
+                    field : 'carNumber',
+                    title : '车牌号'
                 },
                 {
-                    field : 'tareWeight',
-                    title : '皮重'
+                    field : 'vehicleName',
+                    title : '司机姓名'
                 },
                 {
-                    field : 'netWeight',
-                    title : '净重'
+                    field : 'grossWeight',
+                    title : '毛重(kg)'
                 },
                 {
-                    field : 'carNumber',
-                    title : '车牌号'
+                    field : 'tareWeight',
+                    title : '皮重(kg)'
                 },
                 {
-                    field : 'vehicleName',
-                    title : '司机姓名'
+                    field : 'netWeight',
+                    title : '净重(kg)'
                 },
+
                 {
                     field : 'driverNumber',
                     title : '驾驶证号'
@@ -147,36 +152,25 @@
                     field : 'cardNumber',
                     title : '身份证号'
                 },
-                // {
-                //     field : 'incomingTime',
-                //     title : '入厂时间'
-                // },
-                // {
-                //     field : 'type',
-                //     title : '类型'
-                // },
-                // {
-                //     field : 'companyCode',
-                //     title : '货主'
-                // },
-                // {
-                //     field : 'warehouseCode',
-                //     title : '仓库编码'
-                // },
                 {
-                    field : 'userDef2',
-                    title : '物料',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(userDef2, value);
-                    }
+                    field : 'materialCode',
+                    title : '物料编码'
                 },
-                // {
-                //     field : 'type',
-                //     title : '入库类型'
-                // },
+
                 {
                     field : 'supplier',
-                    title : '供应商'
+                    title : '供应商',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        $.each(supplier, function(index, dict) {
+                            if (dict.code == value) {
+                                actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
+                                return false;
+                            }
+                        });
+                        return actions.join('');
+                    }
                 },
                 {
                     field : 'remark',
@@ -80,7 +80,7 @@
                 },
                 {
                     field : 'poundNumber',
-                    title : '榜单编号'
+                    title : '磅单编号'
                 },
                 {
                     field : 'vehicleStatus',
@@ -30,6 +30,12 @@
                         <li>
                             身份证号：<input type="text" name="cardNumber"/>
                         </li>
+                        <li class="time" style="height: 30px">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -70,19 +76,17 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    // var editFlag = [[${@permission.hasPermi('config:warehouse:edit')}]];
-    // var removeFlag = [[${@permission.hasPermi('config:warehouse:remove')}]];
     var prefix = ctx + "vehicle/vehicleShipment";
-    var userDef2 = [[${@dict.getType('probablyMaterial')}]];
+    var customer = [[${@CustomerService.getCode()}]];
     var vehicleDocumentType = [[${@dict.getType('vehicleDocumentType')}]];
-    // var datas = [[${@dict.getType('sys_normal_disable')}]];
+
     $(function() {
         var options = {
             url: prefix + "/list",
             createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{code}",
             removeUrl: prefix + "/remove",
-            modalName: "车辆入库",
+            modalName: "车辆出库",
             search: false,
             columns: [
                 {
@@ -99,10 +103,13 @@
                 },
                 {
                     field : 'id',
-                    title : '车辆出库id',
+                    title : 'id',
                     sortable:true
                 },
-
+                {
+                    field : 'poundNumber',
+                    title : '磅单编号'
+                },
                 {
                     field : 'vehicleDocumentType',
                     title : '车辆单据类型',
@@ -111,44 +118,26 @@
                     }
                 },
                 {
-                    field : 'poundNumber',
-                    title : '榜单编号'
-                },
-                {
-                    field : 'vehicleStatus',
-                    title : '状态'
-                },
-                {
-                    field : 'customerCode',
-                    title : '客户'
+                    field : 'carNumber',
+                    title : '车牌号'
                 },
                 {
-                    field : 'userDef2',
-                    title : '物料',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(userDef2, value);
-                    }
+                    field : 'vehicleName',
+                    title : '司机姓名'
                 },
                 {
                     field : 'grossWeight',
-                    title : '毛重'
+                    title : '毛重(kg)'
                 },
                 {
                     field : 'tareWeight',
-                    title : '皮重'
+                    title : '皮重(kg)'
                 },
                 {
                     field : 'netWeight',
-                    title : '净重量'
-                },
-                {
-                    field : 'carNumber',
-                    title : '车牌号'
-                },
-                {
-                    field : 'vehicleName',
-                    title : '司机姓名'
+                    title : '净重(kg)'
                 },
+
                 {
                     field : 'driverNumber',
                     title : '驾驶证号'
@@ -158,28 +147,8 @@
                     title : '身份证号'
                 },
                 {
-                    field : 'incomingTime',
-                    title : '出厂时间'
-                },
-                {
-                    field : 'remark',
-                    title : '备注'
-                },
-                {
-                    field : 'type',
-                    title : '类型'
-                },
-                {
-                    field : 'companyCode',
-                    title : '货主'
-                },
-                {
-                    field : 'warehouseCode',
-                    title : '仓库编码'
-                },
-                {
-                    field : 'type',
-                    title : '出库类型'
+                    field : 'materialCode',
+                    title : '物料编码'
                 },
                 // {
                 //     field : 'materialCode',
@@ -194,6 +163,21 @@
                 //     title : '物料单位'
                 // },
                 {
+                    field: 'customerCode',
+                    title: '客户',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        $.each(customer, function (index, dict) {
+                            if (dict.code == value) {
+                                actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
+                                return false;
+                            }
+                        });
+                        return actions.join('');
+                    }
+                },
+                {
                     field : 'remark',
                     title : '备注'
                 },