diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
index dec629a..918f659 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
@@ -96,6 +96,35 @@ public class ReceiptDetailController extends BaseController {
}
}
+ /**
+ * 查询待入库明细
+ */
+ @RequiresPermissions("receipt:waitReceiptDetailList:view")
+ @GetMapping("waitReceiptDetailList")
+ public String receiptHeader() {
+ return prefix + "/waitReceiptDetail";
+ }
+
+ /**
+ * 查询待入库明细
+ */
+ @PostMapping("/waitReceiptDetailList")
+ @ResponseBody
+ public TableDataInfo waitReceiptDetailList(String createdBegin, String createdEnd, String receiptCode, String materialCode, String materialName, String noticeNo, String SNNO) {
+ LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper
+ .ge(StringUtils.isNotBlank(createdBegin), ReceiptDetail::getCreated, createdBegin)
+ .le(StringUtils.isNotBlank(createdEnd), ReceiptDetail::getCreated, createdEnd)
+ .eq(StringUtils.isNotBlank(materialCode), ReceiptDetail::getMaterialCode, materialCode)
+ .eq(StringUtils.isNotBlank(materialName), ReceiptDetail::getMaterialName, materialName)
+ .eq(StringUtils.isNotBlank(noticeNo), ReceiptDetail::getNoticeNo, noticeNo)
+ .eq(StringUtils.isNotBlank(receiptCode), ReceiptDetail::getReceiptCode, receiptCode)
+ .eq(StringUtils.isNotBlank(SNNO), ReceiptDetail::getSNNO, SNNO);
+ List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
+ List<ReceiptDetail> filteredList = filterAlreadyStoredRecords(list);
+ return getDataTable(filteredList);
+ }
+
/**
* PDA查询入库详情
diff --git a/src/main/resources/templates/receipt/receiptDetail/waitReceiptDetail.html b/src/main/resources/templates/receipt/receiptDetail/waitReceiptDetail.html
new file mode 100644
index 0000000..b704c72
--- /dev/null
+++ b/src/main/resources/templates/receipt/receiptDetail/waitReceiptDetail.html
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
+ xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+
+<div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 select-info">
+ <form id="receiptDetail-form">
+ <div class="select-list">
+ <ul>
+ <li>入库单号：<input type="text" name="receiptCode"/></li>
+ <li>条码：<input type="text" name="SNNO" id="SNNO"></li>
+ <li>通知单号：<input type="text" name="noticeNo" id="noticeNo"></li>
+ <li>
+ 物料编码：<input type="text" name="materialCode"/>
+ </li>
+ <li>
+ 物料名称：<input type="text" name="materialName"/>
+ </li>
+ <li class="time">
+ <label>创建时间： </label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+ name="createdBegin" autocomplete="off"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+ name="createdEnd" autocomplete="off"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+ class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm"
+ onclick="$.form.reset('receiptDetail-form')"><i
+ class="fa fa-refresh"></i> 重置</a>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div class="col-sm-12 select-info">
+ <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+ </div>
+ </div>
+</div>
+
+
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+
+ var noReturnRequiredFlag = [[${@permission.hasPermi('receipt:receiptHeader:noReturnRequired')}]];
+ var printFlag = [[${@permission.hasPermi('receipt:receiptHeader:report')}]];
+ let receiveFlag = [[${@permission.hasPermi('receipt:receiptHeader:receive')}]];
+ var detailPrefix = ctx + "receipt/receiptDetail";
+ var datas = [[${@dict.getType('sys_normal_disable')}]];
+ var receiptTypes = [[${@receiptTypeService.getType()}]];
+ var originalWarehouse = [[${@dict.getType('originalWarehouse')}]];
+ var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
+ var uploadStatus = [[${@dict.getType('uploadStatus')}]];
+ var company = [[${@companyService.getCode()}]];
+ var supplier = [[${@SupplierService.getCode()}]];
+ var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
+ var receiptId = '';
+ var receiptCode = '';
+ let status = [[${status}]];
+ var statusFirst = [[${statusFirst}]];
+ var statusLast = [[${statusLast}]];
+ var yes_or_no = [[${@dict.getType('yes_or_no')}]];
+ var prefix = ctx + "receipt/receiptDetail";
+ $(function () {
+ var options = {
+ url: prefix + "/waitReceiptDetailList",
+ modalName: "入库明细",
+ search: false,
+ columns: [{
+ checkbox: true
+ },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-primary btn-xs to-receive" onclick="Toreceiving(\'' + row.receiptCode + '\')"><i class="fa fa-cart-plus"></i>组盘</a> ');
+ return actions.join('');
+ }
+ },
+ {
+ field: 'id',
+ title: 'id',
+ visible: false
+ },
+ {
+ field: 'noticeNo',
+ title: '通知单号'
+ },
+ {
+ field: 'receiptCode',
+ title: '入库单编码'
+ },
+ {
+ field: 'materialCode',
+ title: '物料编码'
+ },
+ {
+ field: 'materialName',
+ title: '物料名称'
+ },
+ {
+ field: 'materialSpec',
+ title: '物料规格'
+ },
+ {
+ field: 'materialUnit',
+ title: '物料单位'
+ },
+ {
+ field: 'processStamp',
+ title: '明细状态',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(receiptHeaderStatus, value);
+ }
+ },
+ {
+ field: 'sNNO',
+ title: '条码',
+ visible: true
+ },
+ {
+ field: 'agingDate',
+ title: '入库日期',
+ visible: false
+ },
+ {
+ field: 'qty',
+ title: '单据数量'
+ },
+ {
+ field: 'taskQty',
+ title: '已收数量'
+ },
+ {
+ field: 'selfCreated',
+ title: '自建单据物料',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(yes_or_no, value);
+ },
+ align: 'center',
+ },
+ {
+ field: 'isMustFlatWarehouseMaterial',
+ title: '必须平库物料',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(yes_or_no, value);
+ },
+ align: 'center',
+ },
+ {
+ field: 'isFlatWarehouse',
+ title: '仓库类型',
+ visible: true,
+ align: 'center',
+ formatter: function (value, row, index) {
+ if (value == 1) {
+ return '<span style="color:#51855c">平库</span>'
+ } else {
+ return '<span style="color:black">立库</span>'
+ }
+ }
+ },
+ {
+ field: 'frequency',
+ title: '物料使用频率',
+ formatter: function (value, row, index) {
+ if (value === '频繁使用物料') {
+ return '<span style="color:#941616">频繁使用物料</span>'
+ } else if (value === '常用物料') {
+ return '<span style="color:#016201">常用物料</span>'
+ } else {
+ return '<span></span>'
+ }
+ },
+ },
+ {
+ field: 'inventorySts',
+ title: '库存状态',
+ visible: false
+ },
+ {
+ field: 'created',
+ title: '创建时间'
+ },
+ {
+ field: 'createdBy',
+ title: '创建用户',
+ visible: false
+ },
+ {
+ field: 'lastUpdated',
+ title: '最后修改时间',
+ visible: true
+ },
+ {
+ field: 'lastUpdatedBy',
+ title: '最后操作人',
+ visible: true
+ },
+ {
+ field: 'remarks',
+ title: '备注',
+ },
+ ]
+ };
+ $.table.init(options);
+ });
+
+
+ /* 收货 */
+ function Toreceiving(code) {
+ let storage = window.localStorage;
+ storage.receiving_code = code;
+ createMenuItem(ctx + "receipt/receiving", "收货");
+ parent.$('.tabReload').click();
+ }
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/system/role/role.html b/src/main/resources/templates/system/role/role.html
index 0b5b6bd..5a87d83 100644
--- a/src/main/resources/templates/system/role/role.html
+++ b/src/main/resources/templates/system/role/role.html
@@ -1,126 +1,125 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org"
- xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+ xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="gray-bg">
- <div class="container-div">
- <div class="row">
- <div class="col-sm-12 select-info">
- <form id="role-form">
- <div class="select-list">
- <ul>
- <li>
- 角色名称：<input type="text" name="roleName"/>
- </li>
- <li>
- 权限字符：<input type="text" name="roleCode"/>
- </li>
- <li>
- 角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">
- <option value="">所有</option>
- <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
- </select>
- </li>
- <!--<li class="time">-->
- <!--<label>创建时间： </label>-->
- <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>-->
- <!--<span>-</span>-->
- <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>-->
- <!--</li>-->
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('role-form')"><i class="fa fa-refresh"></i> 重置</a>
- <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>-->
- </li>
- </ul>
- </div>
- </form>
- </div>
+<div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 select-info">
+ <form id="role-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ 角色名称：<input type="text" name="roleName"/>
+ </li>
+ <li>
+ 权限字符：<input type="text" name="roleCode"/>
+ </li>
+ <li>
+ 角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">
+ <option value="">所有</option>
+ <option th:each="e : ${type}" th:text="${e['dictLabel']}"
+ th:value="${e['dictValue']}"></option>
+ </select>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+ class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('role-form')"><i
+ class="fa fa-refresh"></i> 重置</a>
+ <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>-->
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
- <div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
- <i class="fa fa-plus"></i> 新增
- </a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:role:remove">
- <i class="fa fa-trash-o"></i> 删除
- </a>
- </div>
+ <div class="btn-group hidden-xs" id="toolbar" role="group">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
+ shiro:hasPermission="system:role:add">
+ <i class="fa fa-plus"></i> 新增
+ </a>
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
+ shiro:hasPermission="system:role:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>
+ </div>
- <div class="col-sm-12 select-info">
- <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
- </div>
- </div>
- </div>
- <div th:include="include :: footer"></div>
- <script th:inline="javascript">
- var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
- var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
- var datas = [[${@dict.getType('sys_normal_disable')}]];
- var prefix = ctx + "system/role"
+ <div class="col-sm-12 select-info">
+ <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+ </div>
+ </div>
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+ var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
+ var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
+ var datas = [[${@dict.getType('sys_normal_disable')}]];
+ var prefix = ctx + "system/role"
- $(function() {
- var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{id}",
- removeUrl: prefix + "/remove",
- exportUrl: prefix + "/export",
- sortName: "roleSort",
- // height:610,
- modalName: "角色",
- search: false,
- showExport: false,
- columns: [{
- checkbox: true
- },
- {
- field: 'id',
- title: '角色id'
- },
- {
- field: 'roleName',
- title: '角色名称',
- sortable: true
- },
- {
- field: 'roleCode',
- title: '权限编码',
- sortable: true
- },
- {
- field: 'roleSort',
- title: '显示顺序',
- sortable: true
- },
- {
- field: 'enable',
- title: '状态',
- align: 'center',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(datas, value);
- }
- },
- {
- field: 'createTime',
- title: '创建时间',
- sortable: true
- },
- {
- title: '操作',
- align: 'center',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
- return actions.join('');
- }
- }]
- };
- $.table.init(options);
- });
- </script>
+ $(function () {
+ var options = {
+ url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ exportUrl: prefix + "/export",
+ sortName: "roleSort",
+ // height:610,
+ modalName: "角色",
+ search: false,
+ showExport: false,
+ columns: [{
+ checkbox: true
+ },
+ {
+ field: 'id',
+ title: '角色id'
+ },
+ {
+ field: 'roleName',
+ title: '角色名称',
+ sortable: true
+ },
+ {
+ field: 'roleCode',
+ title: '权限编码',
+ sortable: true
+ },
+ {
+ field: 'roleSort',
+ title: '显示顺序',
+ sortable: true
+ },
+ {
+ field: 'enable',
+ title: '状态',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(datas, value);
+ }
+ },
+ {
+ field: 'createTime',
+ title: '创建时间',
+ sortable: true
+ },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+</script>
</body>
</html>