diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
index 5645228..ca3f676 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/controller/ReceiptHeaderHistoryController.java
@@ -9,12 +9,15 @@ import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.aspectj.lang.annotation.Log;
import com.huaheng.framework.aspectj.lang.constant.BusinessType;
import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -82,4 +85,20 @@ public class ReceiptHeaderHistoryController extends BaseController {
return getDataTable(list);
}
}
+
+ /**
+ * 查询入库单
+ */
+ @ApiOperation(value="查询入库单 ", notes="查询入库单 ", httpMethod = "POST")
+ @RequiresPermissions("receipt:receiptDetail:add")
+ @Log(title = "入库-入库单 ",operating = "查询入库单 ", action = BusinessType.OTHER)
+ @PostMapping("/getReceiptHeader")
+ @ResponseBody
+ public AjaxResult<ReceiptHeaderHistory> getReceiptHeader(String id) {
+ if (StringUtils.isEmpty(id)){
+ return AjaxResult.success("");
+ }
+ return AjaxResult.success(receiptHeaderHistoryService.getById(id));
+ }
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c93a95c..955174d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,7 @@ huaheng:
#版本
version: 4.0.0
#版权年份
- copyrightYear: 2018
+ copyrightYear: 2020
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/Huaheng/uploadPath/
# 获取ip地址开关
diff --git a/src/main/resources/templates/receipt/receiptDetailHistory/receiptDetailHistory.html b/src/main/resources/templates/receipt/receiptDetailHistory/receiptDetailHistory.html
index 2ac2672..b3cca9a 100644
--- a/src/main/resources/templates/receipt/receiptDetailHistory/receiptDetailHistory.html
+++ b/src/main/resources/templates/receipt/receiptDetailHistory/receiptDetailHistory.html
@@ -61,7 +61,7 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
queryParams: queryParams,
- modalName: "入库明细历史",
+ modalName: "入库历史明细",
search: false,
sortName: "id",
sortOrder: "desc",
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index 5759fe8..24e8eac 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -679,7 +679,6 @@
// $("#tabBase").addClass("in active");
loadDetail();
}
-
/* 入库单列表-详细 */
function loadDetail() {
$.ajax({
diff --git a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
index 7c17ffa..046149c 100644
--- a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
+++ b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
@@ -111,21 +111,12 @@
title : '入库单号'
},
{
- field : 'referCode',
- title : '关联单号'
- },
- {
- field : 'referId',
- title : '关联单号(内部号)'
- },
- {
- field : 'referType',
- title : '关联订单类型'
- },
- {
field : 'companyCode',
title : '货主编码',
- visible:false
+ },
+ {
+ field : 'referCode',
+ title : '上游单号'
},
{
field : 'warehouseCode',
@@ -148,26 +139,6 @@
}
},
{
- field : 'scheduledArriveDate',
- title : '预计到达日期'
- },
- {
- field : 'actualArriveDate',
- title : '实际到达日期'
- },
- {
- field : 'startCheckinDatetime',
- title : '开始收货日期'
- },
- {
- field : 'endCheckinDatetime',
- title : '结束收货日期'
- },
- {
- field : 'recvDock',
- title : '月台货位'
- },
- {
field : 'closedAt',
title : '关闭时间',
visible : false
@@ -230,12 +201,10 @@
field : 'created',
title : '创建时间',
sortable:true,
- visible:false
},
{
field : 'createdBy',
title : '创建用户',
- visible:false
},
{
field : 'lastUpdated',
@@ -267,9 +236,244 @@
$.table.init(options);
});
+ $("#bootstrap-table1").bootstrapTable({
+ // url: detailPrefix + "/list",
+ createUrl: prefix1 + "/add",
+ updateUrl: prefix1 + "/edit/{id}",
+ removeUrl: prefix1 + "/remove",
+ // search: true, //搜索
+ sortable: true, //排序
+ showRefresh: true, //刷新
+ showToggle:true, //视图切换
+ clickToSelect: true,
+ showColumns:true, //列选择
+ // detailView:true,
+ showExport: true, //导出
+ exportDataType: "all", //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
+ modalName: "入库明细",
+ sortName: "lastUpdated",
+ sortOrder: "desc",
+ iconSize: "outline",
+ toolbar: "#toolbar1",
+ contentType: "application/x-www-form-urlencoded",
+ pagination: true, // 是否显示分页（*）
+ pageNumber: 1, // 初始化加载第一页，默认第一页
+ pageSize: 50, // 每页的记录行数（*）
+ pageList: [10, 25, 50, 100], // 可供选择的每页的行数（*）
+ onRefresh: function(){
+ loadDetail();
+ },
+ columns: [{
+ checkbox: true
+ },
+ {
+ field : 'id',
+ title : 'id'
+ },
+ {
+ field : 'receiptCode',
+ title : '入库单编码'
+ },
+ {
+ field : 'materialCode',
+ title : '物料编码'
+ },
+ {
+ field : 'materialName',
+ title : '物料名称'
+ },
+ {
+ field : 'materialSpec',
+ title : '物料规格'
+ },
+ {
+ field : 'materialUnit',
+ title : '物料单位'
+ },
+ {
+ field : 'supplierCode',
+ title : '供应商编码',
+ visible:false
+ },
+ {
+ field : 'batch',
+ title : '批次'
+ },
+ {
+ field : 'lot',
+ title : '批号' ,
+ },
+ {
+ field : 'projectNo',
+ title : '项目号' ,
+ },
+ {
+ field : 'qcCheck',
+ title : '是否质检',
+ align : "center",
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (value == 0) {
+ actions.push("<span class='badge badge-info'>是</span>");
+ } else {
+ actions.push("<span class='badge badge-info'>否</span>");
+ }
+ return actions.join('');
+ },
+ visible:false
+ },
+ {
+ field : 'projectNo',
+ title : '项目号',
+ visible:false
+ },
+ {
+ field : 'manufactureDate',
+ title : '生产日期',
+ visible:false
+ },
+ {
+ field : 'expirationDate',
+ title : '失效日期' ,
+ visible:false
+ },
+ {
+ field : 'agingDate',
+ title : '入库日期' ,
+ visible:false
+ },
+ {
+ field : 'totalQty',
+ title : '总数量'
+ },
+ {
+ field : 'openQty',
+ title : '已收数量'
+ },
+ {
+ field : 'referCode',
+ title : 'ERP单号',
+ visible : false
+ },
+ {
+ field : 'referId',
+ title : 'ERP内部号',
+ visible : false
+ },
+ {
+ field : 'referLineNum',
+ title : 'ERP行号',
+ visible : false
+ },
+ {
+ field : 'locatingRule',
+ title : '定位规则',
+ visible:false
+ },
+ {
+ field : 'inventorySts',
+ title : '库存状态',
+ visible : false
+ },
+ {
+ field : 'itemListPrice',
+ title : '标价',
+ visible:false
+ },
+ {
+ field : 'itemNetPrice',
+ title : '净价',
+ visible:false
+ },
+ {
+ field : 'price',
+ title : '单价' ,
+ visible:false
+ },
+ {
+ field : 'statusFlowCode',
+ title : '流程编码',
+ visible:false
+ },
+ {
+ field : 'isVirtualBom',
+ title : '是否虚拟套件',
+ align : "center",
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(isVirtualBoms, value);
+ },
+ visible:false
+ },
+ {
+ field : 'created',
+ title : '创建时间'
+ },
+ {
+ field : 'createdBy',
+ title : '创建用户',
+ visible:false
+ },
+ {
+ field : 'lastUpdated',
+ title : '最后修改时间',
+ visible:false
+ },
+ {
+ field : 'lastUpdatedBy',
+ title : '更新用户' ,
+ visible:false
+ },
+ {
+ field : 'userDef1',
+ title : '自定义字段1' ,
+ visible:false
+ },
+ {
+ field : 'userDef2',
+ title : '自定义字段2' ,
+ visible:false
+ },
+ {
+ field : 'userDef3',
+ title : '自定义字段3' ,
+ visible:false
+ },
+ {
+ title: '操作',
+ align: 'center',
+ events:'operateEvents',
+ formatter: function(value, row, index) {
+ var actions = [];
+ actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+ return actions.join('');
+ }
+ }]
+ });
+
+ /* 入库单列表-详细 */
function detail(id, code) {
- var url = prefix1+"/list/" + id;
- createtable(url);
+ receiptId = id;
+ receiptCode=code;
+ $("#myTab li").removeClass("active");
+ $("#tabHeader").removeClass("in active");
+ $("#myTab li:eq(1)").addClass("active");
+ $("#tabDetail").addClass("in active");
+ // $("#tabBase").addClass("in active");
+ loadDetail();
+ }
+
+ function loadDetail() {
+ $.ajax({
+ url:ctx + 'receipt/receiptDetailHistory/list',
+ type:"post",
+ data:{
+ receiptId:receiptId,
+ },
+ success:function (value) {
+ $("#bootstrap-table1").bootstrapTable('load',value.data);
+ }
+ });
}
function createtable(url) {