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

tongzhonghao
2 parents 410d85ce 452a6b95
Showing 12 changed files with 195 additions and 229 deletions
src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/resources/templates/barcode/barCodeDetail/add.html
src/main/resources/templates/barcode/barCodeHeader/add.html
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.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/receipt/receiving/selectBarCodeHeader.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -92,9 +92,12 @@ public class BarCodeApiService {
             barCodeDetail.setCompanyCode(QuantityConstant.DEFAULT_COMPANYCODE);
             barCodeDetail.setReceiptId(barCodeHeader.getId());
             barCodeDetail.setCode(detail.getCode());
+            barCodeDetail.setDayShift("day");
+            AjaxResult ajaxResultCode = barCodeDetailService.createRegenerationCode(1);
+            String regenerationCode = (String)ajaxResultCode.getData();
+            barCodeDetail.setRegenerationCode(regenerationCode);
             barCodeDetail.setReceiptCode(barCodeHeader.getCode());
             String materialCode = detail.getMaterialCode();
-            String materialUnit = detail.getMaterialUnit();
             BigDecimal qty = detail.getQty();
             BigDecimal weight = detail.getWeight();
             BarCodeHeader oneBarCodeHeader = barCodeHeaderService.getOne(new LambdaQueryWrapper<BarCodeHeader>().eq(BarCodeHeader::getId, barCodeHeader.getId()));
@@ -3,7 +3,6 @@ package com.huaheng.pc.barcode.barcodeDetail.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.DataUtils;
 import com.huaheng.common.utils.StringUtils;
@@ -15,8 +14,6 @@ import com.huaheng.pc.barcode.barcodeHeader.domain.BarCodeHeader;
 import com.huaheng.pc.barcode.barcodeHeader.service.BarCodeHeaderService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
-import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
-import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -977,6 +977,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         receiptContainerDetail.setRecycler(receiptDetail.getRecycler());
         receiptContainerDetail.setCountryCode(batteryBean.getCountryCode());
         receiptContainerDetail.setRemark(batteryBean.getRemark());
+        receiptContainerDetail.setMaterialUnit(receiptDetail.getMaterialUnit());
         if (!receiptContainerDetailService.save(receiptContainerDetail)){
             return AjaxResult.error("保存入库组盘详情失败");
@@ -259,7 +259,7 @@
             },
             success : function(result) {
                 if (result.code == web_status.SUCCESS) {
-                    $("#regenerationCode").val(result.msg);
+                    $("#regenerationCode").val(result.data);
                 }
             }
         });
@@ -25,7 +25,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">成品托盘号：</label>
+				<label class="col-sm-3 control-label">托盘号：</label>
 				<div class="col-sm-8">
 					<input id="barCodeHeaderCode" name="barCodeHeaderCode" class="form-control" type="text">
 				</div>
@@ -199,7 +199,7 @@
                 // },
                 {
                     field : 'barCodeHeaderCode',
-                    title : '成品托盘号',
+                    title : '托盘号',
                 },
                 {
                     field : 'materialBatch',
@@ -276,7 +276,9 @@
                     align: 'left',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                        if (row.firstStatus == 800 && row.lastStatus == 800) {
+                            actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                        }
                             actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs"  onclick="detail(\''+ row.id + '\',\''+ row.code + '\',\''+ row.receiptType + '\',\''+ row.grossWeight + '\',\''+ row.tareWeight + '\',\''+ row.netWeight + '\',\''+ row.materialBatch + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
                         if (row.firstStatus < 100)
                             actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
@@ -109,7 +109,7 @@
 				<!--				<li>收货重量：<input type="text" id="receiveWeight"/></li>-->
 				<li hidden>容器编号：<input type="text" id="containerCode"/></li>
 				<li hidden>库位编码：<input type="text" id="locationCoder"/></li>
-				<li id="barhidden">&nbsp;&nbsp;成品托盘号：<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/>
+				<li id="barhidden">&nbsp;&nbsp;托盘号：<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/>
 					<input type="hidden" id="barCodeHeaderId" />
 					<button class="btn btn-sm btn-success" onclick="selectCode()">请选择</button>
 				</li>
@@ -109,23 +109,15 @@
 			<!--组盘输入区 -->
 			<div>
 				<button class="btn btn-danger" onclick="receipt()">组&nbsp&nbsp&nbsp盘</button>
-
 			</div>
 			<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>
 				<li hidden>库位编码：<input type="text" id="locationCoder"/></li>
-				<li id="barhidden">&nbsp;&nbsp;成品托盘号：<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/>
+				<li id="barhidden">&nbsp;&nbsp;托盘号：<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/>
 					<input type="hidden" id="barCodeHeaderId" />
 					<button class="btn btn-sm btn-success" onclick="selectCode()">请选择</button>
 				</li>
@@ -136,15 +128,12 @@
 							<option value="">--请选择--</option>
 							<option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
-						<!--电池包类型：<input type="text" id="batteryPackType" placeholder="电池类必填"/></li>-->
 					</li>
 					<li >
 						<span class="selectClass">电池类型:</span>
-						<select id="batteryTypes" name="batteryTypes" class="form-control"  placeholder="电池类必填">
+						<select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryTypes=${@dict.getType('batteryTypes')}">
 							<option value="">--请选择--</option>
-							<option value="1">电池包</option>
-							<option value="2">电池模块</option>
-							<option value="3">电池单体</option>
+							<option th:each="dict : ${batteryTypes}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 					</li>
 					<li >
@@ -202,21 +191,13 @@
 						<div id="my_thumbnail" style="width:150px;height:150px;margin-left: 10px;margin-top:5px;">
 						</div>
 					</li>-->
-
-
-					<!--完整程度：<input type="text" id="completeness" placeholder="电池类必填"/></li>-->
-					<!--<li>电池个数：<input type="text" id="batteryQty"/></li>-->
-
 				</div>
-
 			</ul>
-
 		</div>
 		<div class="col-sm-12  table-striped-right" style="padding-top: 13px;">
 			<!--需要组盘入库明细 -->
 			<table id="bootstrap-table" style="background: rgb(255, 255, 255);" data-mobile-responsive="true" class="table table-bordered table-hover text-nowrap"></table>
-
 		</div>
 		<div class="col-sm-12 select-info table-striped-bottom">
@@ -239,23 +220,23 @@
 			<table id="bootstrap-table1" data-mobile-responsive="true"
 				   class="table table-bordered table-hover text-nowrap"></table>
-			<ul class="select-list top_text">
-				<li><span class="table-title">本物料库存</span></li>
-			</ul>
-			<table id="bootstrap-table2" data-mobile-responsive="true"
-				   class="table table-bordered table-hover text-nowrap"></table>
+<!--			<ul class="select-list top_text">-->
+<!--				<li><span class="table-title">本物料库存</span></li>-->
+<!--			</ul>-->
+<!--			<table id="bootstrap-table2" data-mobile-responsive="true"-->
+<!--				   class="table table-bordered table-hover text-nowrap"></table>-->
-			<ul class="select-list top_text">
-				<li>空容器类型：<select name="type" id="containerType" th:with="typeList=${@containerType.getCode()}">
-					<option value="">所有</option>
-					<option th:each="c:${typeList}" th:text="${c['name']}" th:value="${c['code']}"></option>
-				</select></li>
-				<li>
-					<button class="btn btn-sm btn-success" onclick="containerTypeSearch()">搜索</button>
-				</li>
-			</ul>
-			<table id="bootstrap-table3" data-mobile-responsive="true"
-				   class="table table-bordered table-hover text-nowrap"></table>
+<!--			<ul class="select-list top_text">-->
+<!--				<li>空容器类型：<select name="type" id="containerType" th:with="typeList=${@containerType.getCode()}">-->
+<!--					<option value="">所有</option>-->
+<!--					<option th:each="c:${typeList}" th:text="${c['name']}" th:value="${c['code']}"></option>-->
+<!--				</select></li>-->
+<!--				<li>-->
+<!--					<button class="btn btn-sm btn-success" onclick="containerTypeSearch()">搜索</button>-->
+<!--				</li>-->
+<!--			</ul>-->
+<!--			<table id="bootstrap-table3" data-mobile-responsive="true"-->
+<!--				   class="table table-bordered table-hover text-nowrap"></table>-->
 		</div>
 	</div>
@@ -272,9 +253,10 @@
 	var Types = [[${@dict.getType('taskType')}]];
 	var Status=[[${@dict.getType('receiptContainerHeaderStatus')}]];
 	var inventoryStatus =[[${@dict.getType('inventoryStatus')}]];
-	var batteryPackType =[[${@dict.getType('batteryPackType')}]];
+	var batteryTypes = [[${@dict.getType('batteryTypes')}]];
+	var batteryPackType = [[${@dict.getType('batteryPackType')}]];
 	var supplier =[[${@SupplierService.getCode()}]];
-	//var batteryTypes =[[${@dict.getType('batteryTypes')}]];
+	var completeness = [[${@dict.getType('completeness')}]];
 	connect();
 	$(function () {
@@ -335,8 +317,7 @@
 									inventorySts: value.data[i].inventorySts,
 									materialUnit: value.data[i].materialUnit,
 									electricQuantity: value.data[i].electricQuantity,
-									batteryPackageWeight: value.data[i].batteryPackageWeight
-
+									batteryPackageWeight: value.data[i].batteryPackageWeight,
 								}
 							});
 						}
@@ -508,22 +489,10 @@
 				field : 'openQty',
 				title : '已入数量'
 			},
-			// {
-			// 	field : 'totalWeight',
-			// 	title : '单据重量'
-			// },
-			/*			{
-                            field : 'batteryPackageWeight',
-                            title : '电池包重量'
-                        },*/
 			{
 				field : 'electricQuantity',
 				title : '电池包电量'
 			},
-			// {
-			// 	field : 'openWeight',
-			// 	title : '已入重量'
-			// },
 			{
 				field : 'inventorySts',
 				title : '库存状态'
@@ -579,6 +548,33 @@
 				}
 			},
 			{
+				field : 'status',
+				title : '组盘状态',
+				align: 'center',
+				formatter: function(value, row, index) {
+					return $.table.selectDictLabel(Status, value);
+				}
+			},
+			{
+				field : 'batteryPackTwoCode',
+				title : '电池包二维码'
+			},
+			{
+				field : 'containerCode',
+				title : '容器编号',
+				visible: false
+			},
+			{
+				field : 'id',
+				title : '组盘明细id',
+				visible: false
+			},
+			{
+				field : 'receiptContainerId',
+				title : '组盘头id',
+				visible: false
+			},
+			{
 				field : 'materialCode',
 				title : '物料编码'
 			},
@@ -587,50 +583,32 @@
 				title:"物料名称"
 			},
-			// {
-			//     field:"materialSpec",
-			//     title:"物料规格"
-			// },
 			{
-				field : 'qty',
-				title : '数量'
+				field:"materialSpec",
+				title:"物料规格"
 			},
 			{
-				field : 'batteryPackTwoCode',
-				title : '电池二维码'
+				field: 'materialUnit',
+				title: '物料单位'
 			},
 			{
-				field : 'poundCode',
-				title : '磅单编号'
+				field : 'qty',
+				title : '数量'
 			},
-			{
-				field : 'batteryTypes',
-				title : '电池类型',
-				formatter: function(value, row, index) {
-					var showhtml='';
-					if(value!=''&&value!=undefined&&value!=null){
-						if(value==1){
-							showhtml='电池包';
-						}else if (value ==2){
-							showhtml='电池模块';
-						}else if(value==3){
-							showhtml='电池单体';
-						}
-					}
-					return showhtml;
-				}
+			{
+				field : 'electricQuantity',
+				title : '电池包电量'
 			},
 			{
-				field : 'batteryPackType',
-				title : '电池种类',
+				field : 'supplierCode',
+				title : '供应商',
+				align: 'center',
 				formatter: function(value, row, index) {
-					console.log(value)
 					var actions = [];
-					$.each(batteryPackType, function(index, dict) {
-						console.log(dict.dictValue)
-						if (dict.dictValue == value) {
-							actions.push("<span class='badge badge-info'>" + dict.dictLabel + "</span>");
+					$.each(supplier, function(index, dict) {
+						if (dict.code == value) {
+							actions.push("<span class='badge badge-info'>" + dict.name + "</span>");
 							return false;
 						}
 					});
@@ -639,76 +617,60 @@
 			},
 			{
 				field : 'materialBatch',
-				title : '原料批号'
+				title : '原料批号',
 			},
 			{
-				field : 'batteryPackTwoCode',
-				title : '供应商',
+				field : 'completeness',
+				title : '完整程度',
 				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('');
+					return $.table.selectDictLabel(completeness, value);
 				}
-
 			},
 			{
-				field : 'countryCode',
-				title : '国家编码'
+				field : 'batteryTypes',
+				title : '电池产品类型',
+				formatter: function(value, row, index) {
+					return $.table.selectDictLabel(batteryTypes, value);
+				}
+			},
+			{
+				field : 'batteryPackType',
+				title : '电池包种类',
+				align: 'center',
+				visible:true,
+				formatter: function(value, row, index) {
+					return $.table.selectDictLabel(batteryPackType, value);
+				}
+			},
+			{
+				field : 'poundCode',
+				title : '过磅单号' ,
 			},
 			{
 				field : 'recycler',
-				title : '回收人'
+				title : '回收人' ,
 			},
 			{
-				field : 'containerCode',
-				title : '容器编号'
+				field : 'countryCode',
+				title : '国家编码' ,
 			},
 			{
-				field : 'id',
-				title : '组盘明细id',
-				visible: false
+				field : 'materialGrossWeight',
+				title : '电池毛重' ,
 			},
 			{
-				field : 'receiptContainerId',
-				title : '组盘头id',
-				visible: false
+				field : 'materialTareWeight',
+				title : '电池皮重' ,
 			},
-
-
 			{
-				field : 'electricQuantity',
-				title : '电池包电量'
+				field : 'materialNetWeight',
+				title : '电池净重' ,
 			},
-			// {
-			// 	field : 'batteryPackageWeight',
-			// 	title : '电池包重量'
-			// },
-			// {
-			// 	field : 'weights',
-			// 	title : '重量'
-			// },
-			// {
-			// 	field : 'sn',
-			// 	title : '序列号'
-			// },
-			// {
-			//     field : 'project',
-			//     title : '项目号',
-			// 	visible: false
-			// },
 			{
-				field : 'status',
-				title : '组盘状态',
-				align: 'center',
-				formatter: function(value, row, index) {
-					return $.table.selectDictLabel(Status, value);
-				}
+				field : 'remark',
+				title : '电池包入库备注' ,
 			},
+
 			{
 				field : 'receiptDetailId',
 				title : '入库单明细id'
@@ -14,7 +14,7 @@
                             入库单号：<input type="text" name="code"/>
                         </li>
                         <li>
-                            成品托盘号：<input type="text" name="barCodeHeaderCode"/>
+                            托盘号：<input type="text" name="barCodeHeaderCode"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -108,14 +108,14 @@
                            shiro:hasPermission="shipment:bill:remove">
                             <i class="fa fa-trash-o"></i> 删除
                         </a>
-<!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="review()"-->
-<!--                           shiro:hasPermission="shipment:bill:edit">-->
-<!--                            <i class="fa fa-plus"></i> 订单审核-->
-<!--                        </a>-->
-<!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="wave()"-->
-<!--                           shiro:hasPermission="shipment:bill:wave">-->
-<!--                            <i class="fa fa-plus"></i> 加入波次-->
-<!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="review()"-->
+                        <!--                           shiro:hasPermission="shipment:bill:edit">-->
+                        <!--                            <i class="fa fa-plus"></i> 订单审核-->
+                        <!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-success btn-rounded" onclick="wave()"-->
+                        <!--                           shiro:hasPermission="shipment:bill:wave">-->
+                        <!--                            <i class="fa fa-plus"></i> 加入波次-->
+                        <!--                        </a>-->
                     </div>
                     <table id="bootstrap-table" data-mobile-responsive="true"
                            class="table table-bordered table-hover text-nowrap"></table>
@@ -146,13 +146,13 @@
                                             <li>上游订单号：<input type="text" name="shipmentSourceCode"
                                                              id="shipmentSourceCode"></li>
                                             <li>毛重：<input type="text" name="grossWeight"
-                                                             id="grossWeight"></li>
+                                                          id="grossWeight"></li>
                                             <li>皮重：<input type="text" name="tareWeight"
                                                           id="tareWeight"></li>
                                             <li>净重：<input type="text" name="netWeight"
                                                           id="netWeight"></li>
                                             <li>磅单编号：<input type="text" name="poundNumber"
-                                                          id="poundNumber"></li>
+                                                            id="poundNumber"></li>
                                             <li>订单平台：<input type="text" name="shipmentSourcePlatform"
                                                             id="shipmentSourcePlatform"></li>
                                             <li>出库单类型：<input type="text" name="shipmentType" id="shipmentType"></li>
@@ -250,14 +250,14 @@
                            shiro:hasPermission="shipment:shippingCombination:combination">
                             <i class="fa fa-hand-lizard-o"></i> 手动组盘
                         </a>
-<!--                        <a class="btn btn-outline btn-primary btn-rounded auto-shipment" onclick="Toshipping(1)"-->
-<!--                           shiro:hasPermission="shipment:shippingCombination:combination">-->
-<!--                            <i class="fa fa-code-fork"></i> 自动组盘-->
-<!--                        </a>-->
-<!--                        <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"-->
-<!--                           shiro:hasPermission="shipment:shippingCombination:combination">-->
-<!--                            <i class="fa fa-code-fork"></i> 自动组盘并生成任务-->
-<!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-primary btn-rounded auto-shipment" onclick="Toshipping(1)"-->
+                        <!--                           shiro:hasPermission="shipment:shippingCombination:combination">-->
+                        <!--                            <i class="fa fa-code-fork"></i> 自动组盘-->
+                        <!--                        </a>-->
+                        <!--                        <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"-->
+                        <!--                           shiro:hasPermission="shipment:shippingCombination:combination">-->
+                        <!--                            <i class="fa fa-code-fork"></i> 自动组盘并生成任务-->
+                        <!--                        </a>-->
                     </div>
                     <table id="bootstrap-table-detail" data-row-style="rowStyle" data-mobile-responsive="true"
                            class="table table-bordered table-hover text-nowrap"></table>
@@ -310,19 +310,22 @@
                     checkbox: true
                 },
                 {
-                    title: '操作1',
+                    title: '操作',
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
+                        if (row.firstStatus == 500 && row.lastStatus == 500) {
+                            actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                        }
                         if (row.lastStatus >= 200)
-                            actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs"  onclick="detail(\''+ row.id + '\',\''+ row.code + '\',\''+ row.receiptType + '\',\''+ row.grossWeight + '\',\''+ row.tareWeight + '\',\''+ row.netWeight + '\',\''+ row.materialBatch + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
-                         actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+                            actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs"  onclick="detail(\'' + row.id + '\',\'' + row.code + '\',\'' + row.receiptType + '\',\'' + row.grossWeight + '\',\'' + row.tareWeight + '\',\'' + row.netWeight + '\',\'' + row.materialBatch + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
+
                         // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
                         if (row.firstStatus < 100) {
                             actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         }
                         if (row.firstStatus == 500 && row.lastStatus == 500) {
-                            actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
+                            actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-upload"></i>回传</a>');
                         }
                         return actions.join('');
                     }
@@ -376,14 +379,14 @@
                 //     }
                 // },
                 {
-                    field : 'referId',
-                    title : '上游单号fid',
-                    sortable:true
+                    field: 'referId',
+                    title: '上游单号fid',
+                    sortable: true
                 },
                 {
-                    field : 'referCode',
-                    title : '上游单号fbillno',
-                    sortable:true
+                    field: 'referCode',
+                    title: '上游单号fbillno',
+                    sortable: true
                 },
                 // {
                 //     field: 'projectCode',
@@ -476,7 +479,7 @@
                     title: '更新用户',
                     visible: false
                 },
-]
+            ]
         };
         $.table.init(options);
     });
@@ -511,7 +514,7 @@
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         }
                         if (row.firstStatus == 500 && row.lastStatus == 500) {
-                            actions.push('<a class="btn btn-info btn-xs ' + receiveFlag + '" href="#" onclick="receive(\''+row.id+'\')"><i class="fa fa-upload"></i>回传</a>');
+                            actions.push('<a class="btn btn-info btn-xs ' + receiveFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-upload"></i>回传</a>');
                         }
                         return actions.join('');
                     }
@@ -533,24 +536,24 @@
                     title: '物料名称'
                 },
                 {
-                    field : 'materialUnit',
-                    title : '物料单位'
+                    field: 'materialUnit',
+                    title: '物料单位'
                 },
                 {
-                    field : 'grossWeight',
-                    title : '毛重',
+                    field: 'grossWeight',
+                    title: '毛重',
                 },
                 {
-                    field : 'tareWeight',
-                    title : '皮重',
+                    field: 'tareWeight',
+                    title: '皮重',
                 },
                 {
-                    field : 'netWeight',
-                    title : '净重',
+                    field: 'netWeight',
+                    title: '净重',
                 },
                 {
-                    field : 'poundNumber',
-                    title : '磅单编号',
+                    field: 'poundNumber',
+                    title: '磅单编号',
                 },
                 // {
@@ -656,7 +659,7 @@
                     field: 'lastUpdatedBy',
                     title: '更新用户'
                 }
-]
+            ]
         }
     );
@@ -694,13 +697,13 @@
     /*入库单列表-详细*/
-    function detail(id, code,grossWeight,netWeight,tareWeight,poundNumber) {
+    function detail(id, code, grossWeight, netWeight, tareWeight, poundNumber) {
         shipmentId = id;
         shipmentCode = code;
-        grossWeight=grossWeight;
-        netWeight=netWeight;
-        tareWeight=tareWeight;
-        poundNumber=poundNumber;
+        grossWeight = grossWeight;
+        netWeight = netWeight;
+        tareWeight = tareWeight;
+        poundNumber = poundNumber;
         $("#myTab li").removeClass("active");
         $("#tabHeader").removeClass("in active");
         $("#myTab li:eq(1)").addClass("active");
@@ -782,7 +785,7 @@
                 + "&tareWeight=" + $('#tareWeight').val()
                 + "&netWeight=" + $('#netWeight').val()
                 + "&poundNumber=" + $('#poundNumber').val()
-            +"&sourceCode=" + $('#shipmentSourceCode').val();
+                + "&sourceCode=" + $('#shipmentSourceCode').val();
             $.modal.open("添加", url);
         }
     }
@@ -794,8 +797,8 @@
     }
     function receive(id) {
-        var url = prefix+"/receive";
-        var data = { "id": id};
+        var url = prefix + "/receive";
+        var data = {"id": id};
         $.operate.submit(url, "post", "json", data);
     }
@@ -921,46 +924,47 @@
         };
         $.ajax(config)
     }
+
     /**
      * 批量绑定车辆信息
      */
-    function bindCar(){
-        var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections');
+    function bindCar() {
+        var rows = $("#bootstrap-table-detail").bootstrapTable('getSelections');
         if (rows.length == 0) {
             $.modal.alertWarning("请至少选择一条记录");
             return;
         }
-        $.modal.confirm("确认要绑定选中的" + rows.length + "条数据吗?", function() {
+        $.modal.confirm("确认要绑定选中的" + rows.length + "条数据吗?", function () {
             var ids = "";
-            for(var i=0; i<rows.length; i++) {
+            for (var i = 0; i < rows.length; i++) {
                 ids = ids + rows[i].id + ","
             }
-            var url = ctx + "vehicle/vehicleShipment/bindVehicleShipment/"+ids;
-            var winObj = $.modal.open("绑定车辆" , url);
+            var url = ctx + "vehicle/vehicleShipment/bindVehicleShipment/" + ids;
+            var winObj = $.modal.open("绑定车辆", url);
         })
     }
     /**
      * 解绑车辆
      */
-    function unbindCar(){
-        var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections');
+    function unbindCar() {
+        var rows = $("#bootstrap-table-detail").bootstrapTable('getSelections');
         if (rows.length == 0) {
             $.modal.alertWarning("请至少选择一条记录");
             return;
         }
-        $.modal.confirm("确认要解除绑定选中的" + rows.length + "条数据吗?", function() {
+        $.modal.confirm("确认要解除绑定选中的" + rows.length + "条数据吗?", function () {
             var ids = "";
-            for(var i=0; i<rows.length; i++) {
+            for (var i = 0; i < rows.length; i++) {
                 ids = ids + rows[i].id + ","
             }
-            var url = ctx + "shipment/shipmentDetail/unbindCar/"+ids.substring(0, ids.length-1);
+            var url = ctx + "shipment/shipmentDetail/unbindCar/" + ids.substring(0, ids.length - 1);
             var config = {
                 url: url,
                 type: "post",
                 dataType: "json",
                 success: function (result) {
-                    if(result.code==web_status.SUCCESS){
+                    if (result.code == web_status.SUCCESS) {
                         $.modal.msgSuccess(result.msg);
                         loadDetail();
                     }
@@ -986,7 +990,7 @@
                 type: 'post',
                 data: {
                     shipmentCode,
-                    code:$("#code").val()
+                    code: $("#code").val()
                 },
                 success: function (res) {
                     if (res.code === 200) {
@@ -997,7 +1001,7 @@
                     }
                 }
             });
-        }else if(flag == 1){
+        } else if (flag == 1) {
             storage.auto = flag;
             createMenuItem(url, "出库自动组盘");
             parent.$('.tabReload').click();
@@ -1012,7 +1016,7 @@
             tareWeight = $("#bootstrap-table tr:eq(1) td:eq(2)").text();
         }
-        detail(shipmentId, shipmentCode,tareWeight);
+        detail(shipmentId, shipmentCode, tareWeight);
     });
     /* 点击主表面板 */
@@ -74,11 +74,11 @@
 						<a class="btn btn-outline btn-success btn-rounded" onclick="print()" shiro:hasPermission="task:task:execute">
 							<i class="fa fa-print"></i> 打印
 						</a>
-<!--						<a class="btn btn-outline btn-primary btn-rounded" onclick="batchExecute()">-->
-<!--							<i class="fa fa-send"></i> 批量执行-->
-<!--						</a>-->
+						<!--						<a class="btn btn-outline btn-primary btn-rounded" onclick="batchExecute()">-->
+						<!--							<i class="fa fa-send"></i> 批量执行-->
+						<!--						</a>-->
 						<a class="btn btn-outline btn-primary btn-rounded" onclick="batchComplete()" shiro:hasPermission="task:task:completeTaskByWMS">
-						<i class="fa fa-check"></i> 批量完成
+							<i class="fa fa-check"></i> 批量完成
 						</a>
 						<a class="btn btn-outline btn-danger btn-rounded" onclick="batchRemoveHead()">
 							<i class="fa fa-remove"></i>批量取消
@@ -216,7 +216,7 @@
 				},
 				{
 					field : 'barCodeHeaderCode',
-					title : '成品托盘号' ,
+					title : '托盘号' ,
 				},
 				// {
 				// 	field : 'batteryPackageWeight',
@@ -432,16 +432,16 @@
 					return $.table.selectDictLabel(batteryPackType, value);
 				}
 			},
-			{
-				field : 'fromLocation',
-				title : '源库位',
-				sortable:true
-			},
-			{
-				field : 'toLocation',
-				title : '目的库位',
-				sortable:true
-			},
+			// {
+			// 	field : 'fromLocation',
+			// 	title : '源库位',
+			// 	sortable:true
+			// },
+			// {
+			// 	field : 'toLocation',
+			// 	title : '目的库位',
+			// 	sortable:true
+			// },
 			{
 				field : 'poundCode',
 				title : '过磅单号' ,
@@ -470,9 +470,6 @@
 				field : 'remark',
 				title : '电池包入库备注' ,
 			},
-
-
-
 			// {
 			// 	field : 'weights',
 			// 	title : '重量'