diff --git a/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java b/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java
index 4b59045..d953e70 100644
--- a/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java
@@ -223,7 +223,8 @@ public class BasicDataApiService {
// return AjaxResult.error("没有该货主!!");
// }
String code=material.getCode();
- if(code.startsWith("293") || code.startsWith("290") || code.startsWith("288")|| code.startsWith("11601")|| code.startsWith("29302136C")|| code.startsWith("29302136M")|| code.startsWith("196")){
+// if(code.startsWith("293") || code.startsWith("290") || code.startsWith("288")|| code.startsWith("11601")|| code.startsWith("29302136C")|| code.startsWith("29302136M")|| code.startsWith("196")){
+ if (code.startsWith("196")){
material.setIsBattery(1);
}else{
material.setIsBattery(2);
diff --git a/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java b/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
index 5726c23..924aaa1 100644
--- a/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
@@ -151,10 +151,15 @@ public class ReceiptApiService {
receiptHeader = receiptHeaderService.getOne(new LambdaQueryWrapper<ReceiptHeader>()
.eq(ReceiptHeader::getWarehouseCode, receiptHeader.getWarehouseCode())
.eq(ReceiptHeader::getCode, receiptHeader.getCode()));
- Supplier supplier = supplierService.getOne(new LambdaQueryWrapper<Supplier>().eq(Supplier::getCode,receiptHeader.getSupplierCode()));
- if (supplier==null){
- return AjaxResult.error("没有这个供应商");
+
+ Supplier supplier=null;
+ if (receiptHeader.getReceiptType()=="CGRKD"){
+ supplier = supplierService.getOne(new LambdaQueryWrapper<Supplier>().eq(Supplier::getCode,receiptHeader.getSupplierCode()));
+ if (supplier==null){
+ return AjaxResult.error("没有这个供应商");
+ }
}
+
List<ReceiptDetail> receiptDetailList = new ArrayList<>();
for (ReceiptDetail receiptDetail : receiptDetails) {
receiptDetail.setReceiptId(receiptHeader.getId());
@@ -177,7 +182,9 @@ public class ReceiptApiService {
receiptDetail.setMaterialSpec(material.getSpec());
receiptDetail.setMaterialUnit(material.getUnit());
receiptDetail.setMaterialIsBattery(material.getIsBattery());
- receiptDetail.setAllCreditCode(supplier.getAllCreditCode());
+ if (supplier!=null) {
+ receiptDetail.setAllCreditCode(supplier.getAllCreditCode());
+ }
//生成电池包二维码
LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper = Wrappers.lambdaQuery();
receiptDetailWrapper.select(ReceiptDetail::getBatteryPackTwoCode);
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index f615250..8a033e1 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -599,6 +599,10 @@
title : '物料名称'
},
{
+ field : 'materialUnit',
+ title : '物料单位'
+ },
+ {
field : 'materialSpec',
title : '物料规格',
},
diff --git a/src/main/resources/templates/receipt/receiving/receiving.html b/src/main/resources/templates/receipt/receiving/receiving.html
index 18b72fb..e3e8a5b 100644
--- a/src/main/resources/templates/receipt/receiving/receiving.html
+++ b/src/main/resources/templates/receipt/receiving/receiving.html
@@ -63,7 +63,7 @@
<option value="5">库区E</option>
</select>-->
<li>收货数量：<input type="text" id="receiveNum"/></li>
-<!-- <li>收货重量：<input type="text" id="receiveWeight"/></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> 主条码：<input type="text" id="barCodeHeaderCode" readonly style="width: 50%"/>
@@ -99,8 +99,8 @@
<li>净重：<input type="text" id="materialNetWeight" placeholder="电池类必填"/>
<li>回收人：<input type="text" id="recycler" placeholder="电池类必填"/>
- <!--完整程度：<input type="text" id="completeness" placeholder="电池类必填"/></li>-->
- <!--<li>电池个数：<input type="text" id="batteryQty"/></li>-->
+ <!--完整程度：<input type="text" id="completeness" placeholder="电池类必填"/></li>-->
+ <!--<li>电池个数：<input type="text" id="batteryQty"/></li>-->
</div>
<li>
@@ -108,14 +108,14 @@
</li>
</ul>
<div class="btn-group hidden-xs" id="toolbar1" role="group">
-<!-- <a class="btn btn-outline btn-success btn-rounded" onclick="positioning()"-->
-<!-- shiro:hasPermission="receipt:receiptDetail:add">-->
-<!-- <i class="fa fa-map-pin"></i> 定位-->
-<!-- </a>-->
-<!-- <a class="btn btn-outline btn-info btn-rounded" onclick="cancelPositioning()"-->
-<!-- shiro:hasPermission="receipt:receiptDetail:remove">-->
-<!-- <i class="fa fa-times"></i> 取消定位-->
-<!-- </a>-->
+ <!-- <a class="btn btn-outline btn-success btn-rounded" onclick="positioning()"-->
+ <!-- shiro:hasPermission="receipt:receiptDetail:add">-->
+ <!-- <i class="fa fa-map-pin"></i> 定位-->
+ <!-- </a>-->
+ <!-- <a class="btn btn-outline btn-info btn-rounded" onclick="cancelPositioning()"-->
+ <!-- shiro:hasPermission="receipt:receiptDetail:remove">-->
+ <!-- <i class="fa fa-times"></i> 取消定位-->
+ <!-- </a>-->
<a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"
shiro:hasPermission="receipt:receiptDetail:remove">
<i class="fa fa-trash-o"></i> 取消收货
@@ -152,11 +152,11 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
- var addFlag = [[${@permission.hasPermi('receipt:receiving:add')}]];
- var removeFlag = [[${@permission.hasPermi('receipt:receiving:remove')}]];
- var prefix = ctx + "receipt/receiving";
- var Types = [[${@dict.getType('taskType')}]];
- var Status=[[${@dict.getType('receiptContainerHeaderStatus')}]];
+ var addFlag = [[${@permission.hasPermi('receipt:receiving:add')}]];
+ var removeFlag = [[${@permission.hasPermi('receipt:receiving:remove')}]];
+ var prefix = ctx + "receipt/receiving";
+ var Types = [[${@dict.getType('taskType')}]];
+ var Status=[[${@dict.getType('receiptContainerHeaderStatus')}]];
var inventoryStatus =[[${@dict.getType('inventoryStatus')}]];
$(function () {
@@ -182,142 +182,142 @@
});
// 收货显示的数据
- function list_select(code) {
- $.ajax({
- url: prefix + "/scanBill",
- type: 'post',
- datatype: 'json',
- data: {
- code: code
- },
- error:function (response) {
- console.log(response);
- },
- success: function (value) {
- var qty_show=0;
- var qtyCompleted_show=0;
- $("#bootstrap-table").bootstrapTable('removeAll');
- if(value.data){
- for (var i = 0; i < value.data.length; i++) {
- if (value.data[i].totalQty > value.data[i].openQty || value.data[i].totalWeight > value.data[i].openWeight) {
- $("#bootstrap-table").bootstrapTable('insertRow', {
- index: 0, row: {
- projectNo:value.data[i].project,
- id: value.data[i].id,
+ function list_select(code) {
+ $.ajax({
+ url: prefix + "/scanBill",
+ type: 'post',
+ datatype: 'json',
+ data: {
+ code: code
+ },
+ error:function (response) {
+ console.log(response);
+ },
+ success: function (value) {
+ var qty_show=0;
+ var qtyCompleted_show=0;
+ $("#bootstrap-table").bootstrapTable('removeAll');
+ if(value.data){
+ for (var i = 0; i < value.data.length; i++) {
+ if (value.data[i].totalQty > value.data[i].openQty || value.data[i].totalWeight > value.data[i].openWeight) {
+ $("#bootstrap-table").bootstrapTable('insertRow', {
+ index: 0, row: {
+ projectNo:value.data[i].project,
+ id: value.data[i].id,
materialName: value.data[i].materialName,
- receiptId: value.data[i].receiptId,
- receiptCode: value.data[i].receiptCode,
- materialCode: value.data[i].materialCode,
- totalQty: value.data[i].totalQty,
- openQty: value.data[i].openQty,
+ receiptId: value.data[i].receiptId,
+ receiptCode: value.data[i].receiptCode,
+ materialCode: value.data[i].materialCode,
+ totalQty: value.data[i].totalQty,
+ openQty: value.data[i].openQty,
totalWeight: value.data[i].totalWeight,
openWeight: value.data[i].openWeight,
- inventorySts: value.data[i].inventorySts,
+ inventorySts: value.data[i].inventorySts,
materialUnit: value.data[i].materialUnit,
electricQuantity: value.data[i].electricQuantity,
batteryPackageWeight: value.data[i].batteryPackageWeight
}
- });
- }
+ });
+ }
qty_show=value.data[i].totalQty + qty_show;
- qtyCompleted_show=value.data[i].openQty + qtyCompleted_show;
- }
- $("#material_length").text(value.data.length);
- $("#qty_length").text(qty_show);
- $("#qtyCompleted_length").text(qtyCompleted_show);
- }
- else {
- console.log("收货单不存在！")
- }
- }
- })
- }
-
- function list_receiptInfo(code) {
- $.ajax({
- url: prefix + "/getReceiptInfoByBill",
- type: 'post',
- datatype: 'json',
- data: {
- code: code
- },
- error:function (response) {
- console.log(response);
- },
- success: function (value) {
- $("#bootstrap-table1").bootstrapTable('removeAll');
- if(value.data){
- for (var i = 0; i < value.data.length; i++) {
- $("#bootstrap-table1").bootstrapTable('insertRow', {
- index: 0, row: {
- projectNo :value.data[i].projectNo,
- id: value.data[i].id,
+ qtyCompleted_show=value.data[i].openQty + qtyCompleted_show;
+ }
+ $("#material_length").text(value.data.length);
+ $("#qty_length").text(qty_show);
+ $("#qtyCompleted_length").text(qtyCompleted_show);
+ }
+ else {
+ console.log("收货单不存在！")
+ }
+ }
+ })
+ }
+
+ function list_receiptInfo(code) {
+ $.ajax({
+ url: prefix + "/getReceiptInfoByBill",
+ type: 'post',
+ datatype: 'json',
+ data: {
+ code: code
+ },
+ error:function (response) {
+ console.log(response);
+ },
+ success: function (value) {
+ $("#bootstrap-table1").bootstrapTable('removeAll');
+ if(value.data){
+ for (var i = 0; i < value.data.length; i++) {
+ $("#bootstrap-table1").bootstrapTable('insertRow', {
+ index: 0, row: {
+ projectNo :value.data[i].projectNo,
+ id: value.data[i].id,
receiptContainerId:value.data[i].receiptContainerId,
receiptDetailId:value.data[i].receiptDetailId,
- containerCode: value.data[i].containerCode,
- locationCode: value.data[i].locationCode,
- materialCode: value.data[i].materialCode,
- materialName: value.data[i].materialName,
- materialSpec: value.data[i].materialSpec,
+ containerCode: value.data[i].containerCode,
+ locationCode: value.data[i].locationCode,
+ materialCode: value.data[i].materialCode,
+ materialName: value.data[i].materialName,
+ materialSpec: value.data[i].materialSpec,
sn:value.data[i].sn,
taskType:value.data[i].taskType,
- qty: value.data[i].qty,
+ qty: value.data[i].qty,
weights: value.data[i].weights,
- status: value.data[i].status,
- created: value.data[i].created,
- createdBy: value.data[i].createdBy,
+ status: value.data[i].status,
+ created: value.data[i].created,
+ createdBy: value.data[i].createdBy,
electricQuantity: value.data[i].electricQuantity,
batteryPackageWeight: value.data[i].batteryPackageWeight
- }
- });
- }
- }
- else {
- console.log("没有查找到入库容器！")
- }
- }
- })
- }
-
- $("#list-btn").click(initTable);
-
- $("body").bind("keypress",function(e){
- // 兼容FF和IE和Opera
- var theEvent = e || window.event;
- var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
- if (code == 13) {
- e.preventDefault();
- //回车执行查询
- initTable();
- // list_select($("#code").val());
- }
- });
-
- function initTable(){
- var receiptCode=$("#code").val();
- list_select(receiptCode);
- list_receiptInfo(receiptCode);
+ }
+ });
+ }
+ }
+ else {
+ console.log("没有查找到入库容器！")
+ }
+ }
+ })
+ }
+
+ $("#list-btn").click(initTable);
+
+ $("body").bind("keypress",function(e){
+ // 兼容FF和IE和Opera
+ var theEvent = e || window.event;
+ var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+ if (code == 13) {
+ e.preventDefault();
+ //回车执行查询
+ initTable();
+ // list_select($("#code").val());
+ }
+ });
+
+ function initTable(){
+ var receiptCode=$("#code").val();
+ list_select(receiptCode);
+ list_receiptInfo(receiptCode);
$("#bootstrap-table1").bootstrapTable('removeAll');
$("#bootstrap-table2").bootstrapTable('removeAll');
}
//点击将值赋值到文本框
- $("#bootstrap-table").bootstrapTable({
- // url: prefix + "/list",
- createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{id}",
- removeUrl: prefix + "/remove",
- contentType: "application/x-www-form-urlencoded",
- clickToSelect: true,
- modalName: "收货",
+ $("#bootstrap-table").bootstrapTable({
+ // url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ contentType: "application/x-www-form-urlencoded",
+ clickToSelect: true,
+ modalName: "收货",
onRefresh: function(){
},
- onClickRow:function(row,ele,field){
- let code=$("#code").val();
- $("#detailId").val(row.id);
- $("#receiveNum").val(row.totalQty-row.openQty);
+ onClickRow:function(row,ele,field){
+ let code=$("#code").val();
+ $("#detailId").val(row.id);
+ $("#receiveNum").val(row.totalQty-row.openQty);
$("#receiveWeight").val(row.totalWeight-row.openWeight)
$("#materialCode").val(row.materialCode);
//console.log(row)
@@ -328,62 +328,62 @@
}else{
$("#batteryHidden").hide();
}
- $.ajax({
- url:prefix+'/getInventoryInfo',
- type:'post',
- data:{
- code:code,
- id:row.id
- },
- success:res=>{
- // $("#bootstrap-table1").bootstrapTable('load',res.data.list);
- $("#bootstrap-table2").bootstrapTable('load',res.data.inventoryList);
- // $("#bootstrap-table3").bootstrapTable('load',res.data.containerList);
- }
- })
- },
- columns: [
- // {
- // field : 'id',
- // title : 'id号'
- // },
- // {
- // field : 'receiptCode',
- // title : '收货单编码'
- // },
- {
- field : 'materialIsBattery',
- title : '是否电池',
+ $.ajax({
+ url:prefix+'/getInventoryInfo',
+ type:'post',
+ data:{
+ code:code,
+ id:row.id
+ },
+ success:res=>{
+ // $("#bootstrap-table1").bootstrapTable('load',res.data.list);
+ $("#bootstrap-table2").bootstrapTable('load',res.data.inventoryList);
+ // $("#bootstrap-table3").bootstrapTable('load',res.data.containerList);
+ }
+ })
+ },
+ columns: [
+ // {
+ // field : 'id',
+ // title : 'id号'
+ // },
+ // {
+ // field : 'receiptCode',
+ // title : '收货单编码'
+ // },
+ {
+ field : 'materialIsBattery',
+ title : '是否电池',
visible: false
},
- {
- field : 'id',
- title : '明细id'
- },
- {
- field : 'materialCode',
- title : '物料编码'
- },
- {
- field: "materialName",
- title: "名称"
- },
- {
- field : 'totalQty',
- title : '单据数量'
- },
- {
- field : 'openQty',
- title : '已入数量'
- },
+ {
+ field : 'id',
+ title : '明细id'
+ },
+ {
+ field : 'materialCode',
+ title : '物料编码'
+ },
+ {
+ field: "materialName",
+ title: "名称"
+ },
+ {
+ field : 'totalQty',
+ title : '单据数量'
+ },
+ {
+ field : 'openQty',
+ title : '已入数量'
+ },
// {
// field : 'totalWeight',
// title : '单据重量'
// },
-/* {
- field : 'batteryPackageWeight',
- title : '电池包重量'
- },*/
+ /* {
+ field : 'batteryPackageWeight',
+ title : '电池包重量'
+ },*/
{
field : 'electricQuantity',
title : '电池包电量'
@@ -392,44 +392,44 @@
// field : 'openWeight',
// title : '已入重量'
// },
- {
- field : 'inventorySts',
- title : '库存状态'
- },
- {
- field : 'projectNo',
- title : '项目号'
- },
- {
- field : 'materialUnit',
- title : '单位'
- },
-
- ]
- });
-
- $("#bootstrap-table1").bootstrapTable({
- removeUrl: ctx + "receipt/receiptContainerDetail/remove",
- // search: true, //搜索
- showRefresh: true, //刷新
- showToggle:true, //视图切换
- clickToSelect: true,
- showColumns:true, //列选择
- // detailView:true,
+ {
+ field : 'inventorySts',
+ title : '库存状态'
+ },
+ {
+ field : 'projectNo',
+ title : '项目号'
+ },
+ {
+ field : 'materialUnit',
+ title : '单位'
+ },
+
+ ]
+ });
+
+ $("#bootstrap-table1").bootstrapTable({
+ removeUrl: ctx + "receipt/receiptContainerDetail/remove",
+ // search: true, //搜索
+ showRefresh: true, //刷新
+ showToggle:true, //视图切换
+ clickToSelect: true,
+ showColumns:true, //列选择
+ // detailView:true,
+ toolbar: "#toolbar1",
+ showExport: true, //导出
+ exportDataType: "all", //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
+ modalName: "入库组盘",
+ iconSize: "outline",
toolbar: "#toolbar1",
- showExport: true, //导出
- exportDataType: "all", //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
- modalName: "入库组盘",
- iconSize: "outline",
- toolbar: "#toolbar1",
- contentType: "application/x-www-form-urlencoded",
- onRefresh: function(){
- list_receiptInfo($("#code").val());
- },
- columns: [
- {
- checkbox: true,
- },
+ contentType: "application/x-www-form-urlencoded",
+ onRefresh: function(){
+ list_receiptInfo($("#code").val());
+ },
+ columns: [
+ {
+ checkbox: true,
+ },
{
field : 'locationCode',
title : '库位编号'
@@ -438,33 +438,33 @@
field : 'containerCode',
title : '容器编号'
},
- {
- field : 'id',
- title : '组盘明细id',
- visible: false
- },
- {
- field : 'receiptContainerId',
- title : '组盘头id',
+ {
+ field : 'id',
+ title : '组盘明细id',
visible: false
- },
- {
- field : 'materialCode',
- title : '物料编码'
- },
- {
- field:"materialName",
- title:"物料名称"
- },
-
- // {
- // field:"materialSpec",
- // title:"物料规格"
- // },
- {
- field : 'qty',
- title : '数量'
- },
+ },
+ {
+ field : 'receiptContainerId',
+ title : '组盘头id',
+ visible: false
+ },
+ {
+ field : 'materialCode',
+ title : '物料编码'
+ },
+ {
+ field:"materialName",
+ title:"物料名称"
+ },
+
+ // {
+ // field:"materialSpec",
+ // title:"物料规格"
+ // },
+ {
+ field : 'qty',
+ title : '数量'
+ },
{
field : 'electricQuantity',
@@ -482,44 +482,44 @@
// field : 'sn',
// title : '序列号'
// },
- // {
- // field : 'project',
- // title : '项目号',
+ // {
+ // field : 'project',
+ // title : '项目号',
// visible: false
- // },
- {
- field : 'status',
- title : '组盘状态',
- align: 'center',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(Status, value);
- }
- },
- {
- field : 'receiptDetailId',
- title : '入库单明细id'
- },
- {
- field : 'created',
- title : '创建时间'
- },
- {
- field : 'createdBy',
- title : '创建人'
- },
- {
- title: '操作',
- align: 'center',
+ // },
+ {
+ field : 'status',
+ title : '组盘状态',
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(Status, value);
+ }
+ },
+ {
+ field : 'receiptDetailId',
+ title : '入库单明细id'
+ },
+ {
+ field : 'created',
+ title : '创建时间'
+ },
+ {
+ field : 'createdBy',
+ title : '创建人'
+ },
+ {
+ title: '操作',
+ align: 'center',
events:'operateEvents',
- formatter: function(value, row, index) {
- var actions = [];
- if (row.status == 0) {
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a>');
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.status == 0) {
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a>');
}
- return actions.join('');
- }
- }]
- });
+ return actions.join('');
+ }
+ }]
+ });
$("#bootstrap-table2").bootstrapTable({
removeUrl: ctx + "receipt/receiptContainerDetail/remove",
@@ -586,35 +586,35 @@
},
]
});
- window.operateEvents = {
- 'click #qty': function (e, value, row, index) {
- var url = prefix + '/add?';
- jQuery.each(row, function(key, val) {
- url = url + key + "=" + encodeURI(val) + "&";
- });
- var modalName="入库组盘";
- $.modal.open("添加"+modalName,url);
- }
- };
-
- function receiving_refresh() {
- var receiving_code = localStorage.getItem("receiving_code");
- $("#code").val(receiving_code);
- if (receiving_code) {
- initTable();
+ window.operateEvents = {
+ 'click #qty': function (e, value, row, index) {
+ var url = prefix + '/add?';
+ jQuery.each(row, function(key, val) {
+ url = url + key + "=" + encodeURI(val) + "&";
+ });
+ var modalName="入库组盘";
+ $.modal.open("添加"+modalName,url);
}
- localStorage.removeItem("receiving_code");
- }
+ };
- receiving_refresh();
+ function receiving_refresh() {
+ var receiving_code = localStorage.getItem("receiving_code");
+ $("#code").val(receiving_code);
+ if (receiving_code) {
+ initTable();
+ }
+ localStorage.removeItem("receiving_code");
+ }
- function remove(id) {
- $.modal.confirm("确定删除该组盘？", function() {
- var url = ctx + "receipt/receiptContainerDetail/remove";
- var data = { "ids": id };
- $.operate.submitAndCallback(url, "post", "json", data, initTable);
- });
- }
+ receiving_refresh();
+
+ function remove(id) {
+ $.modal.confirm("确定删除该组盘？", function() {
+ var url = ctx + "receipt/receiptContainerDetail/remove";
+ var data = { "ids": id };
+ $.operate.submitAndCallback(url, "post", "json", data, initTable);
+ });
+ }
function positioning() {
let rows = $("#bootstrap-table1").bootstrapTable('getSelections');
@@ -709,22 +709,22 @@
$.table.refresh("bootstrap-table1");
}
- function receipt() {
- let containerCode = $("#containerCode").val();
- let locationCode = $("#locationCoder").val();
+ function receipt() {
+ let containerCode = $("#containerCode").val();
+ let locationCode = $("#locationCoder").val();
let barCodeHeaderCode = $("#barCodeHeaderCode").val();
- Receiving(locationCode, containerCode,barCodeHeaderCode);
- }
-
- /**
- * 组盘
- * @param locationCode
- * @param containerCode
- */
- function Receiving(locationCode,containerCode,barCodeHeaderCode) {
- let receiptCode=$("#code").val();
- let num=$("#receiveNum").val();
- let receiptDetailId=$("#detailId").val();
+ Receiving(locationCode, containerCode,barCodeHeaderCode);
+ }
+
+ /**
+ * 组盘
+ * @param locationCode
+ * @param containerCode
+ */
+ function Receiving(locationCode,containerCode,barCodeHeaderCode) {
+ let receiptCode=$("#code").val();
+ let num=$("#receiveNum").val();
+ let receiptDetailId=$("#detailId").val();
let weights = $("#receiveWeight").val();
let locationCoder = $("#locationCoder").val();
let barCodeHeaderId = $("#barCodeHeaderId").val();
@@ -743,16 +743,16 @@
if(num)
}*/
//console.log(materialCode)
- $.ajax({
- url:ctx + "receipt/receiving/save",
- type:'post',
- data:{
- receiptCode:receiptCode,
- qty: num,
- receiptDetailId:receiptDetailId,
- locationCode:locationCoder,
+ $.ajax({
+ url:ctx + "receipt/receiving/save",
+ type:'post',
+ data:{
+ receiptCode:receiptCode,
+ qty: num,
+ receiptDetailId:receiptDetailId,
+ locationCode:locationCoder,
// locationCoder:locationCoder,
- containerCode:containerCode,
+ containerCode:containerCode,
barCodeHeaderCode:barCodeHeaderCode,
barCodeHeaderId:barCodeHeaderId,
batteryPackType:batteryPackType,
@@ -766,25 +766,25 @@
materialNetWeight:materialNetWeight,
recycler:recycler,
area:area
- },
- success:function (data) {
- if(data.code===200){
- $.modal.msgSuccess('成功');
- initTable();
- }
- else{
- $.modal.msg(data.msg);
- }
- }
- })
- }
+ },
+ success:function (data) {
+ if(data.code===200){
+ $.modal.msgSuccess('成功');
+ initTable();
+ }
+ else{
+ $.modal.msg(data.msg);
+ }
+ }
+ })
+ }
function chooseStation(id) {
var url = ctx + "receipt/receiptContainerHeader/chooseStation" + "/" + id;
$.modal.open("选择站台", url);
}
- function createTask() {
+ function createTask() {
let rows=$("#bootstrap-table1").bootstrapTable('getSelections');
if (rows.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index 20cd1df..6678b4c 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -525,6 +525,10 @@
title: '物料名称'
},
{
+ field : 'materialUnit',
+ title : '物料单位'
+ },
+ {
field : 'grossWeight',
title : '毛重',
},