diff --git a/.idea/misc.xml b/.idea/misc.xml
index 48b4b95..e8ff3b7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,4 +14,7 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
+ <component name="SuppressionsComponent">
+ <option name="suppComments" value="[]" />
+ </component>
</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 6cb772c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/wms2.iml" filepath="$PROJECT_DIR$/.idea/wms2.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java b/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java
index 894dd7c..6f15a08 100644
--- a/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java
+++ b/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java
@@ -179,4 +179,5 @@ public class WareHouseController extends BaseController {
public AjaxResult copySave(String newWarehouseCode) {
return toAjax(warehouseService.warehouseCopy(ShiroUtils.getWarehouseCode(), newWarehouseCode));
}
+
}
diff --git a/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java b/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java
index 29fe37c..7467911 100644
--- a/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java
@@ -209,4 +209,9 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
public List<Warehouse> selectListEntityByEqual(Warehouse condition) {
return warehouseMapper.selectListEntityByEqual(condition);
}
+
+
+ public List<Warehouse> getWarehouse(){
+ return this.list();
+ }
}
diff --git a/src/main/resources/templates/config/receiptPreference/add.html b/src/main/resources/templates/config/receiptPreference/add.html
index 307dc6d..dbf4c3d 100644
--- a/src/main/resources/templates/config/receiptPreference/add.html
+++ b/src/main/resources/templates/config/receiptPreference/add.html
@@ -6,13 +6,21 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-receiptPreference-add">
<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">
+ <select name="warehousecode" id="warehouse" class="form-control" th:with="warehouseList=${@WarehouseService.getWarehouse()}">
+ <option th:each="warehouse : ${warehouseList}" th:text="${warehouse['name']}" th:value="${warehouse['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">首选项代码：</label>
<div class="col-sm-8">
<input id="code" name="code" class="form-control" type="text">
</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="name" name="name" class="form-control" type="text">
</div>
@@ -20,9 +28,10 @@
<div class="form-group">
<label class="col-sm-3 control-label">入库流程：</label>
<div class="col-sm-8">
- <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
+ <select id="receiptFlow" name="receivingflow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
<option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
</select>
+
</div>
</div>
<div class="form-group">
@@ -101,43 +110,59 @@
<div class="form-group">
<label class="col-sm-3 control-label">RF逐件收货：</label>
<div class="col-sm-8">
- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">
+<!-- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">-->
+ <select name="checkinByPiece" class="form-control" type="text" id="checkinByPiece">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">RF自动提交收货：</label>
<div class="col-sm-8">
- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
+<!-- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">-->
+ <select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">abc分类：</label>
<div class="col-sm-8">
- <input id="abcClass" name="abcClass" class="form-control" type="text">
+<!-- <input id="abcClass" name="allowoverreceiving" class="form-control" type="text">-->
+ <select id="abcClass" name="allowoverreceiving" class="form-control" type="text">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保质期（天）：</label>
<div class="col-sm-8">
- <input id="daysToExpire" name="daysToExpire" class="form-control" type="text">
+ <input id="daysToExpire" name="daystoexpire" class="form-control" type="number">
</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="expiringDays" name="expiringDays" class="form-control" type="text">
+<!-- <input id="expiringDays" name="expiringdays" class="form-control" type="text">-->
+ <select id="expiringDays" name="expiringdays" class="form-control" type="text">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收货预警(天)：</label>
<div class="col-sm-8">
- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
+ <input id="minShelfLifeDays" name="minshelflifedays" class="form-control" type="number">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">RF快速上架：</label>
<div class="col-sm-8">
- <select id="allowQuickPutaway" name="allowQuickPutaway" class="form-control">
+ <select id="allowQuickPutaway" name="allowquickputaway" class="form-control">
<option value="0">是</option>
<option value="1">否</option>
</select>
@@ -146,13 +171,13 @@
<div class="form-group">
<label class="col-sm-3 control-label">属性模板：</label>
<div class="col-sm-8">
- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
+ <input id="attributeTemplateCode" name="attributetemplatecode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">快速入库：</label>
<div class="col-sm-8">
- <select id="useQuickCheckIn" name="useQuickCheckIn" class="form-control">
+ <select id="usequickcheckin" name="useQuickCheckIn" class="form-control">
<option value="0">是</option>
<option value="1">否</option>
</select>
@@ -298,8 +323,29 @@
tableValue = formValueReplace(tableValue, "emptyLocRule", $("#emptyLocRule option:selected").val());
tableValue = formValueReplace(tableValue, "useQuickCheckIn", $("#useQuickCheckIn option:selected").val());
tableValue = formValueReplace(tableValue, "allowQuickPutaway", $("#allowQuickPutaway option:selected").val());
+ tableValue = formValueReplace(tableValue, "warehousecode", $("#allowQuickPutaway option:selected").val());
$.operate.save(prefix + "/add", tableValue);
}
+
+
+ });
+ $(function () {
+ $.ajax({
+ url: "../getWarehouseByUserCode",
+ type: 'post',
+ dataType: "json",
+ data: {
+ username: "fxh"
+ },
+ success: function (value) {
+ // console.log(value.data);
+ $("#warehouse").contents().remove();
+ if (value != null && value.data.length >= 1)
+ for (var i = 0; i < value.data.length; i++) {
+ $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
+ }
+ }
+ })
});
</script>
</body>
diff --git a/src/main/resources/templates/config/receiptPreference/edit.html b/src/main/resources/templates/config/receiptPreference/edit.html
index 849c085..eb5ae2f 100644
--- a/src/main/resources/templates/config/receiptPreference/edit.html
+++ b/src/main/resources/templates/config/receiptPreference/edit.html
@@ -7,13 +7,13 @@
<form class="form-horizontal m" id="form-receiptPreference-edit" th:object="${receiptPreference}">
<input id="id" name="id" th:field="*{id}" type="hidden">
<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="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>
+ <label class="col-sm-3 control-label">首选项名字:</label>
<div class="col-sm-8">
<input id="name" name="name" class="form-control" type="text" th:field="*{name}">
</div>
@@ -103,37 +103,53 @@
<div class="form-group">
<label class="col-sm-3 control-label">RF逐件收货：</label>
<div class="col-sm-8">
- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">
+<!-- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">-->
+ <select id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">RF自动提交收货：</label>
<div class="col-sm-8">
- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">
+<!-- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">-->
+ <select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">abc分类：</label>
<div class="col-sm-8">
- <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}">
+<!-- <input id="abcClass" name="allowoverreceiving" class="form-control" type="text" th:field="*{abcClass}">-->
+ <select id="abcClass" name="allowoverreceiving" class="form-control" type="text" th:field="*{abcClass}">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保质期（天）：</label>
<div class="col-sm-8">
- <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}">
+ <input id="daysToExpire" name="daysToExpire" class="form-control" type="number" th:field="*{daysToExpire}">
</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="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
+<!-- <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">-->
+ <select id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">收货预警(天)：</label>
<div class="col-sm-8">
- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
+ <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number" th:field="*{minShelfLifeDays}">
</div>
</div>
<div class="form-group">
diff --git a/src/main/resources/templates/config/receiptPreference/list.html b/src/main/resources/templates/config/receiptPreference/list.html
index 08f6adb..a302c8e 100644
--- a/src/main/resources/templates/config/receiptPreference/list.html
+++ b/src/main/resources/templates/config/receiptPreference/list.html
@@ -1,7 +1,9 @@
<!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>
+<head th:include="include :: header">
+
+</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
@@ -12,7 +14,8 @@
<ul>
<li>
<label>仓库：</label>
- <input type="text" name="warehousecode"/>
+ <select name="warehousecode" id="warehouse" >
+ </select>
</li>
<li>
<label>首选项代码：</label>
@@ -26,13 +29,13 @@
<label>入库流程：</label>
<input type="text" name="receivingflow"/>
</li>
- <li class="select-time">
+ <li class="time">
<label>创建时间：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
- name="params[beginCreated]"/>
+ name="beginCreated" />
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间"
- name="params[endCreated]"/>
+ name="endCreated"/>
</li>
<li>
@@ -52,7 +55,10 @@
</li>
<li>
<label>自动定位：</label>
- <input type="text" name="autolocate"/>
+ <select name="autolocate">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<li>
<label>RF显示未收数量：</label>
@@ -76,34 +82,46 @@
</li>
<li>
<label>RF逐件收货：</label>
- <input type="text" name="checkinbypiece"/>
+ <select name="checkinbypiece">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<li>
<label>RF自动提交收货：</label>
- <input type="text" name="piececonfirm"/>
+ <select name="piececonfirm">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<li>
<label>abc分类：</label>
<select name="allowoverreceiving">
- <option value="">0否</option>
- <option value="-1">1是</option>
+ <option value="0">否</option>
+ <option value="-1">是</option>
</select>
</li>
<li>
- <label>保质期：</label>
- <input type="text" name="daystoexpire"/>
+ <label>保质期(天)：</label>
+ <input type="number" name="daystoexpire"/>
</li>
<li>
<label>临期预警：</label>
- <input type="text" name="expiringdays"/>
+ <select name="expiringdays">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<li>
<label>收货预警(天)：</label>
- <input type="text" name="minshelflifedays"/>
+ <input type="number" name="minshelflifedays"/>
</li>
<li>
<label>RF快速上架：</label>
- <input type="text" name="allowquickputaway"/>
+ <select name="allowquickputaway">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<li>
<label>属性模板：</label>
@@ -111,7 +129,10 @@
</li>
<li>
<label>快速入库：</label>
- <input type="text" name="usequickcheckin"/>
+ <select name="usequickcheckin">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<li>
<label>创建用户：</label>
@@ -119,7 +140,10 @@
</li>
<li>
<label>更新用户：</label>
- <input type="text" name="lastupdatedby"/>
+ <select name="lastupdatedby">
+ <option value="0">否</option>
+ <option value="-1">是</option>
+ </select>
</li>
<p style=" float:right;text-align: right; padding:10px 50px 0 0">
@@ -281,6 +305,7 @@
</div>
<div th:include="include :: footer"></div>
+
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('task:receiptPreference:edit')}]];
var removeFlag = [[${@permission.hasPermi('task:receiptPreference:remove')}]];
@@ -305,105 +330,321 @@
field: 'warehousecode',
title: '仓库'
},
+ // {
+ // field: 'warehousecode',
+ // title: '仓库',
+ // width: "10%",
+ // formatter: function (value, row, index) {
+ // var data = [{ index: index, warehousecode: value }];
+ // return $("#javaTypeTpl").tmpl(data).html();
+ // }
+ // },
{
field: 'code',
title: '首选项代码'
},
+ // {
+ // field: 'name',
+ // title: '首选项名字'
+ // },
{
field: 'name',
- title: '首选项名字'
+ title: '首选项名字',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'receivingflow',
+ // title: '入库流程'
+ // },
{
field: 'receivingflow',
- title: '入库流程'
+ title: '入库流程',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'autoassignlpn',
+ // title: '自动生成托盘号'
+ // },
{
field: 'autoassignlpn',
- title: '自动生成托盘号'
+ title: '自动生成托盘号',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'allowoverreceiving',
+ // title: '允许超收'
+ // },
{
field: 'allowoverreceiving',
- title: '允许超收'
+ title: '允许超收',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'allowoverreceivingqty',
+ // title: '允许超收范围'
+ // },
{
field: 'allowoverreceivingqty',
- title: '允许超收范围'
+ title: '允许超收范围',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'autolocate',
+ // title: '自动定位'
+ // },
{
field: 'autolocate',
- title: '自动定位'
+ title: '自动定位',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'showopenqty',
+ // title: 'RF显示未收数量'
+ // },
{
field: 'showopenqty',
- title: 'RF显示未收数量'
+ title: 'RF显示未收数量',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+
+ // {
+ // field: 'groupputaway',
+ // title: 'RF组车收货'
+ // },
{
field: 'groupputaway',
- title: 'RF组车收货'
+ title: 'RF组车收货',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'manuallybuildlpn',
+ // title: '人工组盘'
+ // },
{
field: 'manuallybuildlpn',
- title: '人工组盘'
+ title: '人工组盘',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'locationrule',
+ // title: '定位规则'
+ // },
{
field: 'locationrule',
- title: '定位规则'
+ title: '定位规则',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'emptylocrule',
+ // title: '空库位规则'
+ // },
{
field: 'emptylocrule',
- title: '空库位规则'
+ title: '空库位规则',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'checkinbypiece',
+ // title: 'RF逐件收货'
+ // },
{
field: 'checkinbypiece',
- title: 'RF逐件收货'
+ title: 'RF逐件收货',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'piececonfirm',
+ // title: 'RF自动提交收货'
+ // },
{
field: 'piececonfirm',
- title: 'RF自动提交收货'
+ title: 'RF自动提交收货',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'abcclass',
+ // title: 'abc分类 0 否 1是'
+ // },
{
field: 'abcclass',
- title: 'abc分类 0 否 1是'
+ title: 'abc分类',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'daystoexpire',
+ // title: '保质期'
+ // },
{
field: 'daystoexpire',
- title: '保质期'
+ title: '保质期',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'expiringdays',
+ // title: '临期预警'
+ // },
{
field: 'expiringdays',
- title: '临期预警'
+ title: '临期预警',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'minshelflifedays',
+ // title: '收货预警(天)'
+ // },
{
field: 'minshelflifedays',
- title: '收货预警(天)'
+ title: '收货预警(天)',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'allowquickputaway',
+ // title: 'RF快速上架'
+ // },
{
field: 'allowquickputaway',
- title: 'RF快速上架'
+ title: 'RF快速上架',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
+ // {
+ // field: 'attributetemplatecode',
+ // title: '属性模板'
+ // },
{
field: 'attributetemplatecode',
- title: '属性模板'
+ title: '属性模板',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'usequickcheckin',
+ // title: '快速入库'
+ // },
{
field: 'usequickcheckin',
- title: '快速入库'
+ title: '快速入库',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
{
field: 'created',
title: '创建时间'
},
+ // {
+ // field: 'createdby',
+ // title: '创建用户'
+ // },
{
field: 'createdby',
- title: '创建用户'
- },
- {
- field: 'lastupdated',
- title: '创建时间'
+ title: '创建用户',
+ width: "10%",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
+ return html;
+ }
},
+ // {
+ // field: 'lastupdated',
+ // title: '创建时间'
+ // },
+ // {
+ // field: 'lastupdatedby',
+ // title: '更新用户'
+ // },
{
field: 'lastupdatedby',
- title: '更新用户'
+ title: '更新用户',
+ width: "5%",
+ formatter: function (value, row, index) {
+ var isCheck = value == 1 ? 'checked' : '';
+ var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
+ return html;
+ }
},
{
@@ -417,11 +658,7 @@
}]
};
$.table.init(options);
- });
-</script>
-<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
-<script>
- $(document).ready(function(){
+
var a =$(".box2 ul li:gt(3):not(:last)");
a.hide();
$(".boxdown").click(function(){
@@ -433,7 +670,28 @@
$(this).addClass('up');
}
});
+
+
+ $.ajax({
+ url: "../getWarehouseByUserCode",
+ type: 'post',
+ dataType: "json",
+ data: {
+ username: "fxh"
+ },
+ success: function (value) {
+ // console.log(value.data);
+ $("#warehouse").contents().remove();
+ if (value != null && value.data.length >= 1)
+ for (var i = 0; i < value.data.length; i++) {
+ $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
+ }
+ }
+ })
+
});
+
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/cycleCountHeader/cyclecountHeader.html b/src/main/resources/templates/inventory/cycleCountHeader/cyclecountHeader.html
new file mode 100644
index 0000000..d70f99c
--- /dev/null
+++ b/src/main/resources/templates/inventory/cycleCountHeader/cyclecountHeader.html
@@ -0,0 +1,338 @@
+<!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">
+ <ul id="myTab" class="nav nav-tabs">
+ <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
+ <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
+ </ul>
+ <div id="myTabContent" class="tab-content">
+ <div class="tab-pane fade in active" id="tabHeader">
+ <div class="col-sm-12 select-info">
+ <form id="cycleHeader-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ 盘点主单ID：<input type="text" name="id"/>
+ </li>
+ <li>
+ 源盘点单号：<input type="text" name="sourceCode"/>
+ </li>
+ <li>
+ 盘点单编码：<input type="text" name="code"/>
+ </li>
+ <li>
+ 原始盘点ID：<input type="text" name="countOrderId"/>
+ </li>
+ <li>
+ 盘点单类型：<select name="countType"
+ th:with="firstStatus=${@dict.getType('cyclecountType')}">
+ <option value="">所有</option>
+ <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
+ th:value="${e['dictValue']}"></option>
+ </select>
+ </li>
+ <li>
+ 盘点单状态：<select name="statusCyc"
+ th:with="lastStatus=${@dict.getType('cyclecountStatus')}">
+ <option value="">所有</option>
+ <option th:each="e : ${lastStatus}" 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="createdBegin"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+ name="createdEnd"/>
+ </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('cycleHeader-form')"><i class="fa fa-refresh"></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="inventory:cycleCountHeader:add">
+ <i class="fa fa-plus"></i> 新增
+ </a>
+ <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
+ shiro:hasPermission="inventory:cycleCountHeader:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>-->
+ </div>
+ <table id="bootstrap-table" data-mobile-responsive="true"
+ class="table table-bordered table-hover"></table>
+ </div>
+ <div class="tab-pane fade" id="tabDetail"></div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+ var reportFlag = [[${@permission.hasPermi('inventory:cycleCountHeader:report')}]];
+ //var editFlag = [[${@permission.hasPermi('inventory:cycleCountHeader:edit')}]];
+ var addAdjust = [[${@permission.hasPermi('inventory:cyclecountHead:addAdjust')}]];
+ var removeFlag = [[${@permission.hasPermi('inventory:cycleCount:remove')}]];
+ var prefix = ctx + "inventory/cycleCountHeader";
+ var datas = [[${@dict.getType('sys_normal_disable')}]];
+ var types = [[${@dict.getType('cyclecountType')}]];
+ var cyclecountStatus = [[${@dict.getType('cyclecountStatus')}]];
+ var ifs = [[${@dict.getType('false_and_true')}]];
+ $(function () {
+ var options = {
+ url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ modalName: "盘点单主",
+ sortName: "created",
+ sortOrder: "desc",
+ search: false,
+ onDblClickRow:function(row){
+ detail(row.id,row.masterCode);
+ },
+ columns: [{
+ checkbox: true
+ },
+ {
+ field: 'id',
+ title: 'ID',
+ sortable: true
+ },
+ {
+ field: 'code',
+ title: '盘点单编码'
+ },
+ {
+ field: 'warehouseCode',
+ title: '仓库',
+ visible: false
+ },
+ {
+ field: 'companyCode',
+ title: '货主编码'
+ },
+ {
+ field: 'round',
+ title: ' 盘点轮次',
+ visible: false
+ },
+ {
+ field: 'sourceCode',
+ title: '源盘点单'
+ },
+
+ {
+ field: 'countOrderId',
+ title: '原始盘点内部号'
+ },
+
+ {
+ field: 'totalLocs',
+ title: '总货位数'
+ },
+ {
+ field: 'totalItems',
+ title: '总物料数'
+ },
+ {
+ field: 'zoneCode',
+ title: '指定区域'
+ },
+ {
+ field: 'locationFilter',
+ title: '库位条件(模糊)',
+ visible: false
+ },
+ {
+ field: 'releasedBy',
+ title: '释放人',
+ visible: false
+ },
+ {
+ field: 'releasedAt',
+ title: '释放时间',
+ visible: false
+ },
+ {
+ field: 'closedBy',
+ title: '关闭人',
+ visible: false
+ },
+ {
+ field: 'closedAt',
+ title: '关闭时间',
+ visible: false
+ },
+ {
+ field: 'countType',
+ title: '盘点单类型',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(types, value);
+ },
+ sortable: true
+ },
+ {
+ field: 'statusCyc',
+ title: '盘点主单状态',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(cyclecountStatus, value);
+ },
+ visible: true
+ },
+ {
+ field: 'verifyBy',
+ title: '审核人'
+ },
+ {
+ field: 'uploadTime',
+ title: '上传时间',
+ visible: false
+ },
+ {
+ field: 'uploadStatus',
+ title: '上传状态',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(ifs, value);
+ }
+ },
+ {
+ field: 'version',
+ title: '数据版本',
+ visible: false
+ },
+ {
+ field: 'created',
+ title: '创建时间',
+ formatter: function (created, row, index) { //去除时间中间的T
+ return created.replace("T", " ");
+ }
+ },
+ {
+ field: 'createdBy',
+ title: '创建用户'
+ },
+ {
+ field: 'lastUpdated',
+ title: '更新时间',
+ formatter: function (lastUpdated, row, index) { //去除时间中间的T
+ return lastUpdated.replace("T", " ");
+ }
+ },
+ {
+ field: 'lastUpdatedBy',
+ title: '更新用户'
+ },
+ {
+ field: 'enable',
+ title: '是否有效',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(datas, value);
+ }
+ },
+ {
+ field: 'remark',
+ title: '备注',
+ visible: true
+ },
+ // {
+ // field : 'userDef1',
+ // title : '自定义字段1'
+ // },
+ // {
+ // field : 'userDef2',
+ // title : '自定义字段2'
+ // },
+ // {
+ // field : 'userDef3',
+ // title : '自定义字段3'
+ // },
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-success btn-xs ' + reportFlag + '" href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+ if(row.statusCyc === 100){
+ actions.push('<a class="btn btn-warning btn-xs ' + addAdjust + '" href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成调整单</a> ');
+ }
+ //actions.push('<a class="btn btn-info 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);
+ $("#myTab li:eq(1)").click(function () {
+ // var cyc_id = $("#bootstrap-table tr:eq(1) td:eq(1)").text();
+ // var cyc_code = $("#bootstrap-table tr:eq(1) td:eq(2)").text();
+ detail();
+ });
+ });
+
+ function detail(id,code) {
+ let url = ctx + "inventory/cycleCountDetail";
+ if (code) {
+ url = ctx + "inventory/cycleCountDetail?cycleCountHeadCode=" + code;
+ }
+ $("#tabDetail").children().remove();
+ $("#myTab li").removeClass("active");
+ var height = $(document).height() - 100 + 'px';
+ var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
+ $("#tabDetail").empty();
+ $("#tabDetail").append(str);
+ $(".tab-pane").removeClass("in active");
+ $("#myTab li:eq(1)").addClass("active");
+ $("#tabDetail").addClass("in active");
+ }
+
+ //盘点单打印
+ function cyclecountPrint(id) {
+ var url = prefix + "/report/" + id;
+ $.modal.open("盘点单打印", url);
+ }
+
+ //生成差异调整单
+ function goAdjust(id) {
+ var url = prefix + "/goAdjust";
+ var data = {"id": id};
+ postInner(url, data);
+ }
+
+ function postInner(url, data) {
+ $.modal.loading("正在处理中，请稍后...");
+ $.ajax({
+ url: url,
+ type: "post",
+ data: data,
+ success: function (result) {
+ if (result.code == web_status.SUCCESS) {
+ $.modal.msgSuccess(result.msg);
+ //update();
+ $("button [name = 'refresh']").click(); //点击事件成功后刷新
+ } else {
+ $.modal.alertError(result.msg);
+ }
+ $.modal.closeLoading();
+ }
+ })
+ }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/task/taskHeader/taskHeader.html b/src/main/resources/templates/task/taskHeader/taskHeader.html
index 2081584..f732eb8 100644
--- a/src/main/resources/templates/task/taskHeader/taskHeader.html
+++ b/src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -179,7 +179,7 @@
{
field : 'companyCode',
title : '货主编码',
- visible:true
+ visible:false
},
{
field : 'taskType',