wms / wms_henanqingyuan · Commits

Commit 1747822cc4810e97f67c5dd6921df6b7c5b7bd0b

Authored by mahuandong
1 parent 584425e9

添加质检头表和明细页面

Inline Side-by-side
Showing 6 changed files with 557 additions and 70 deletions
.idea/compiler.xml
  View file @1747822
... ... @@ -6,8 +6,8 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
  9 + <module name="WMSV1" />
9 10 <module name="huaheng" />
10   - <module name="wms2" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ... @@ -15,7 +15,6 @@
15 15 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
16 16 <module name="WMSV1" options="-parameters" />
17 17 <module name="huaheng" options="-parameters" />
18   - <module name="wms2" options="-parameters" />
19 18 </option>
20 19 </component>
21 20 </project>
22 21 \ No newline at end of file
... ...
.idea/workspace.xml
  View file @1747822
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="3867f38d-4974-4f05-bf81-523c6ebdb1d3" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/domain/SendMailText.java" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/service/MailService.java" afterDir="false" />
7   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/service/MailServiceImpl.java" afterDir="false" />
8   - <change afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/ServiceTest.java" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java" afterDir="false" />
12   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" />
13   - <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
  4 + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
  5 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java" afterDir="false" />
14 11 </list>
15 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16 13 <option name="SHOW_DIALOG" value="false" />
... ... @@ -19,13 +16,13 @@
19 16 <option name="LAST_RESOLUTION" value="IGNORE" />
20 17 </component>
21 18 <component name="DatabaseView">
22   - <option name="SHOW_INTERMEDIATE" value="true" />
  19 + <option name="SHOW_INTERMEDIATE" value="false" />
23 20 <option name="GROUP_DATA_SOURCES" value="true" />
24 21 <option name="GROUP_SCHEMA" value="true" />
25 22 <option name="GROUP_CONTENTS" value="false" />
26 23 <option name="SORT_POSITIONED" value="false" />
27 24 <option name="SHOW_EMPTY_GROUPS" value="false" />
28   - <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
  25 + <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
29 26 <option name="HIDDEN_KINDS">
30 27 <set />
31 28 </option>
... ... @@ -36,21 +33,25 @@
36 33 </path>
37 34 <path>
38 35 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
39   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  36 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  37 + </path>
  38 + <path>
  39 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  40 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
40 41 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
41 42 </path>
42 43 <path>
43 44 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
44   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  45 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
45 46 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
46   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  47 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
47 48 </path>
48 49 <path>
49 50 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
50   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  51 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
51 52 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
52   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
53   - <item name="task_detail: table" type="285a2a93:MysqlImplModel$Table" />
  53 + <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
  54 + <item name="checking_register: table" type="285a2a93:MysqlImplModel$Table" />
54 55 </path>
55 56 </expand>
56 57 <select />
... ... @@ -58,28 +59,56 @@
58 59 <component name="FileTemplateManagerImpl">
59 60 <option name="RECENT_TEMPLATES">
60 61 <list>
61   - <option value="Interface" />
62 62 <option value="Class" />
  63 + <option value="HTML File" />
63 64 </list>
64 65 </option>
65 66 </component>
66 67 <component name="Git.Settings">
  68 + <option name="RECENT_BRANCH_BY_REPOSITORY">
  69 + <map>
  70 + <entry key="$PROJECT_DIR$" value="master" />
  71 + </map>
  72 + </option>
67 73 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
68 74 </component>
69   - <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
  75 + <component name="IgnoredFileRootStore">
  76 + <option name="generatedRoots">
  77 + <set>
  78 + <option value="E:\code\wms2\.idea" />
  79 + </set>
  80 + </option>
  81 + </component>
  82 + <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  83 + <component name="ProjectLevelVcsManager">
  84 + <ConfirmationsSetting value="2" id="Add" />
  85 + </component>
70 86 <component name="PropertiesComponent">
  87 + <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
  88 + <property name="DatabaseDriversLRU" value="mysql" />
  89 + <property name="DefaultHtmlFileTemplate" value="HTML File" />
  90 + <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
  91 + <property name="RequestMappingsPanelOrder0" value="0" />
  92 + <property name="RequestMappingsPanelOrder1" value="1" />
  93 + <property name="RequestMappingsPanelWidth0" value="75" />
  94 + <property name="RequestMappingsPanelWidth1" value="75" />
  95 + <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
71 96 <property name="WebServerToolWindowFactoryState" value="false" />
72 97 <property name="aspect.path.notification.shown" value="true" />
73   - <property name="full.screen.before.presentation.mode" value="false" />
74   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
  98 + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
75 99 <property name="node.js.detected.package.eslint" value="true" />
76 100 <property name="node.js.detected.package.tslint" value="true" />
77 101 <property name="node.js.path.for.package.eslint" value="project" />
78 102 <property name="node.js.path.for.package.tslint" value="project" />
79 103 <property name="node.js.selected.package.eslint" value="(autodetect)" />
80 104 <property name="node.js.selected.package.tslint" value="(autodetect)" />
81   - <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
82   - <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Color Scheme Font" />
  105 + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  106 + </component>
  107 + <component name="RecentsManager">
  108 + <key name="MoveFile.RECENT_KEYS">
  109 + <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
  110 + <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
  111 + </key>
83 112 </component>
84 113 <component name="RunDashboard">
85 114 <option name="ruleStates">
... ... @@ -93,70 +122,83 @@
93 122 </list>
94 123 </option>
95 124 </component>
96   - <component name="RunManager" selected="JUnit.ServiceTest.sendSimpleMail">
97   - <configuration name="ServiceTest.sendSimpleMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
  125 + <component name="RunManager">
  126 + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
98 127 <module name="huaheng" />
99   - <extension name="coverage">
100   - <pattern>
101   - <option name="PATTERN" value="com.huaheng.test.*" />
102   - <option name="ENABLED" value="true" />
103   - </pattern>
104   - </extension>
105   - <option name="PACKAGE_NAME" value="com.huaheng.test" />
106   - <option name="MAIN_CLASS_NAME" value="com.huaheng.test.ServiceTest" />
107   - <option name="METHOD_NAME" value="sendSimpleMail" />
108   - <option name="TEST_OBJECT" value="method" />
  128 + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
  129 + <option name="ALTERNATIVE_JRE_PATH" />
  130 + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
  131 + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
109 132 <method v="2">
110 133 <option name="Make" enabled="true" />
111 134 </method>
112 135 </configuration>
113   - <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
114   - <module name="huaheng" />
115   - <extension name="coverage">
116   - <pattern>
117   - <option name="PATTERN" value="com.huaheng.*" />
118   - <option name="ENABLED" value="true" />
119   - </pattern>
120   - </extension>
  136 + <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
  137 + <module name="WMSV1" />
121 138 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
  139 + <option name="ALTERNATIVE_JRE_PATH" />
122 140 <method v="2">
123 141 <option name="Make" enabled="true" />
124 142 </method>
125 143 </configuration>
126   - <recent_temporary>
127   - <list>
128   - <item itemvalue="JUnit.ServiceTest.sendSimpleMail" />
129   - <item itemvalue="Spring Boot.HuaHengApplication" />
130   - </list>
131   - </recent_temporary>
  144 + </component>
  145 + <component name="ServiceViewManager">
  146 + <option name="allServicesViewState">
  147 + <serviceView>
  148 + <treeState>
  149 + <expand>
  150 + <path>
  151 + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
  152 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  153 + </path>
  154 + </expand>
  155 + <select />
  156 + </treeState>
  157 + </serviceView>
  158 + </option>
132 159 </component>
133 160 <component name="SvnConfiguration">
134 161 <configuration />
135 162 </component>
136 163 <component name="TaskManager">
137 164 <task active="true" id="Default" summary="Default task">
138   - <changelist id="3867f38d-4974-4f05-bf81-523c6ebdb1d3" name="Default Changelist" comment="" />
139   - <created>1567656449978</created>
  165 + <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
  166 + <created>1565160110910</created>
140 167 <option name="number" value="Default" />
141 168 <option name="presentableId" value="Default" />
142   - <updated>1567656449978</updated>
143   - <workItem from="1567656451211" duration="5104000" />
144   - <workItem from="1567668214629" duration="1168000" />
145   - <workItem from="1567669746535" duration="268000" />
146   - <workItem from="1567670126125" duration="31000" />
147   - <workItem from="1567670171788" duration="46000" />
148   - <workItem from="1567670233410" duration="1528000" />
149   - <workItem from="1567730330932" duration="8838000" />
150   - <workItem from="1567741769966" duration="1528000" />
  169 + <updated>1565160110910</updated>
  170 + <workItem from="1565160112236" duration="11971000" />
  171 + <workItem from="1565224833241" duration="14642000" />
  172 + <workItem from="1565242153135" duration="1476000" />
  173 + <workItem from="1565259513116" duration="148000" />
  174 + <workItem from="1565311988064" duration="7176000" />
  175 + <workItem from="1565328536669" duration="797000" />
  176 + <workItem from="1567937269900" duration="1065000" />
  177 + <workItem from="1567939943746" duration="865000" />
  178 + <workItem from="1567950680620" duration="3139000" />
151 179 </task>
152   - <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
153   - <created>1567664306836</created>
  180 + <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
  181 + <created>1565226427512</created>
154 182 <option name="number" value="00001" />
155 183 <option name="presentableId" value="LOCAL-00001" />
156 184 <option name="project" value="LOCAL" />
157   - <updated>1567664306836</updated>
  185 + <updated>1565226427512</updated>
  186 + </task>
  187 + <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
  188 + <created>1565256884822</created>
  189 + <option name="number" value="00002" />
  190 + <option name="presentableId" value="LOCAL-00002" />
  191 + <option name="project" value="LOCAL" />
  192 + <updated>1565256884822</updated>
  193 + </task>
  194 + <task id="LOCAL-00003" summary="修改库区service">
  195 + <created>1565259481656</created>
  196 + <option name="number" value="00003" />
  197 + <option name="presentableId" value="LOCAL-00003" />
  198 + <option name="project" value="LOCAL" />
  199 + <updated>1565259481656</updated>
158 200 </task>
159   - <option name="localTasksCounter" value="2" />
  201 + <option name="localTasksCounter" value="4" />
160 202 <servers />
161 203 </component>
162 204 <component name="TypeScriptGeneratedFilesManager">
... ... @@ -176,7 +218,10 @@
176 218 </option>
177 219 </component>
178 220 <component name="VcsManagerConfiguration">
179   - <MESSAGE value="修改添加物料时使用物料类别生成物料编码" />
180   - <option name="LAST_COMMIT_MESSAGE" value="修改添加物料时使用物料类别生成物料编码" />
  221 + <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
  222 + <MESSAGE value="添加库位、库位类型增删改查接口" />
  223 + <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
  224 + <MESSAGE value="修改库区service" />
  225 + <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
181 226 </component>
182 227 </project>
183 228 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java
  View file @1747822
... ... @@ -116,8 +116,11 @@ public class CheckDetail implements Serializable {
116 116 @ApiModelProperty(value="物料规格")
117 117 private String materialSpec;
118 118  
  119 + /**
  120 + * 物料单位
  121 + */
119 122 @TableField(value = "materialUnit")
120   - @ApiModelProperty(value="null")
  123 + @ApiModelProperty(value="物料单位")
121 124 private String materialUnit;
122 125  
123 126 /**
... ...
src/main/resources/templates/check/checkDetail/checkComplete.html 0 → 100644
  View file @1747822
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-receiptContainerDetail-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">组盘头id号：</label>
  10 + <div class="col-sm-8">
  11 + <input id="headerId" name="headerId" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">入库单明细id号：</label>
  16 + <div class="col-sm-8">
  17 + <input id="receiptDetailId" name="receiptDetailId" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">：</label>
  22 + <div class="col-sm-8">
  23 + <input id="materialCode" name="materialCode" class="form-control" type="text">
  24 + </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="col-sm-3 control-label">：</label>
  28 + <div class="col-sm-8">
  29 + <input id="materialName" name="materialName" class="form-control" type="text">
  30 + </div>
  31 + </div>
  32 + <div class="form-group">
  33 + <label class="col-sm-3 control-label">组盘数量：</label>
  34 + <div class="col-sm-8">
  35 + <input id="qty" name="qty" class="form-control" type="text">
  36 + </div>
  37 + </div>
  38 + <div class="form-group">
  39 + <label class="col-sm-3 control-label">创建时间：</label>
  40 + <div class="col-sm-8">
  41 + <input id="created" name="created" class="form-control" type="text">
  42 + </div>
  43 + </div>
  44 + <div class="form-group">
  45 + <label class="col-sm-3 control-label">创建用户：</label>
  46 + <div class="col-sm-8">
  47 + <input id="createdBy" name="createdBy" class="form-control" type="text">
  48 + </div>
  49 + </div>
  50 + <div class="form-group">
  51 + <div class="form-control-static col-sm-offset-9">
  52 + <button type="submit" class="btn btn-primary">提交</button>
  53 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  54 + </div>
  55 + </div>
  56 + </form>
  57 +</div>
  58 +<div th:include="include::footer"></div>
  59 +<script type="text/javascript">
  60 + var prefix = ctx + "receipt/receiptContainerDetail"
  61 + $("#form-receiptContainerDetail-add").validate({
  62 + rules:{
  63 + xxxx:{
  64 + required:true,
  65 + },
  66 + },
  67 + submitHandler: function(form) {
  68 + $.operate.save(prefix + "/add", $('#form-receiptContainerDetail-add').serialize());
  69 + }
  70 + });
  71 +</script>
  72 +</body>
  73 +</html>
... ...
src/main/resources/templates/check/checkDetail/checkDetail.html 0 → 100644
  View file @1747822
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  9 + <input type="hidden" id="headerId" name="receiptId" th:value="${headerId}"/>
  10 + <!--<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="receipt:receiptContainer:add">-->
  11 + <!--<i class="fa fa-plus"></i> 新增-->
  12 + <!--</a>-->
  13 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="receipt:receiptContainer:remove">
  14 + <i class="fa fa-trash-o"></i> 删除
  15 + </a>
  16 + </div>
  17 +
  18 + <div class="col-sm-12 select-info">
  19 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  20 + </div>
  21 + </div>
  22 +</div>
  23 +<div th:include="include :: footer"></div>
  24 +<script th:inline="javascript">
  25 + // var editFlag = [[${@permission.hasPermi('receipt:receiptContainer:edit')}]];
  26 + var removeFlag = [[${@permission.hasPermi('check:checkDetail:remove')}]];
  27 + var prefix = ctx + "check/checkDetail";
  28 +
  29 + $(function() {
  30 + var options = {
  31 + url: prefix + "/list",
  32 + createUrl: prefix + "/add",
  33 + updateUrl: prefix + "/edit/{id}",
  34 + removeUrl: prefix + "/remove",
  35 + queryParams: queryParams,
  36 + modalName: "质检明细",
  37 + sortName: "id",
  38 + sortOrder: "desc",
  39 + search: false,
  40 + columns: [{
  41 + checkbox: true
  42 + },
  43 + {
  44 + field : 'id',
  45 + title : 'id'
  46 + },
  47 + {
  48 + field : 'checkHeaderId',
  49 + title : '质检头id'
  50 + },
  51 + {
  52 + field : 'warehouseCode',
  53 + title : '仓库编码',
  54 + visible : false
  55 + },
  56 + {
  57 + field : 'checkCode',
  58 + title : '质检单编码'
  59 + },
  60 + {
  61 + field : 'inventoryDetailId',
  62 + title : '库存明细标识'
  63 + },
  64 + {
  65 + field : 'locationCode',
  66 + title : '库位编码'
  67 + },
  68 + {
  69 + field : 'containerCode',
  70 + title : '容器编码'
  71 + },
  72 + {
  73 + field : 'receiptDetailId',
  74 + title : '入库单明细标识'
  75 + },
  76 + {
  77 + field : 'receiptCode',
  78 + title : '入库单号'
  79 + },
  80 + {
  81 + field : 'referCode',
  82 + title : '关联单号"'
  83 + },
  84 + {
  85 + field : 'referLineId',
  86 + title : '关联行号'
  87 + },
  88 + {
  89 + field : 'referPlatform',
  90 + title : '关联平台'
  91 + },
  92 + {
  93 + field : 'materialCode',
  94 + title : '物料编码'
  95 + },
  96 + {
  97 + field : 'materialName',
  98 + title : '物料名称'
  99 + },
  100 + {
  101 + field : 'materialSpec',
  102 + title : '物料规格'
  103 + },
  104 + {
  105 + field : 'materialUnit',
  106 + title : '物料单位'
  107 + },
  108 + {
  109 + field : 'companyCode',
  110 + title : '货主代码'
  111 + },
  112 + {
  113 + field : 'inventorySts',
  114 + title : '库存状态'
  115 + },
  116 + {
  117 + field : 'status',
  118 + title : '状态'
  119 + },
  120 + {
  121 + field : 'qty',
  122 + title : '系统数量'
  123 + },
  124 + {
  125 + field : 'checkBy',
  126 + title : '质检人'
  127 + },
  128 + {
  129 + field : 'checkAt',
  130 + title : '质检时间'
  131 + },
  132 + {
  133 + field : 'created',
  134 + title : '创建时间'
  135 + },
  136 + {
  137 + field : 'createdBy',
  138 + title : '创建用户'
  139 + },
  140 + {
  141 + title: '操作',
  142 + align: 'center',
  143 + formatter: function(value, row, index) {
  144 + var actions = [];
  145 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  146 + if (row.status == 0){
  147 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>开始质检</a> ');
  148 + } else if (row.status == 10) {
  149 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> ');
  150 + }
  151 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
  152 + return actions.join('');
  153 + }
  154 + }]
  155 + };
  156 + $.table.init(options);
  157 + });
  158 +
  159 + function queryParams(params) {
  160 + return {
  161 + headerId:$("#receiptContainerId").val()
  162 + };
  163 + }
  164 +</script>
  165 +</body>
  166 +</html>
0 167 \ No newline at end of file
... ...
src/main/resources/templates/check/checkHeader/checkHeader.html 0 → 100644
  View file @1747822
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +
  7 +<div class="container-div">
  8 + <div class="row">
  9 + <div class="col-sm-12 select-info">
  10 + <ul id="myTab" class="nav nav-tabs">
  11 + <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
  12 + <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
  13 + </ul>
  14 + <div id="myTabContent" class="tab-content">
  15 + <div class="tab-pane fade in active" id="tabHeader">
  16 + <div class="col-sm-12 select-info">
  17 + <form id="receiptHeader-form">
  18 + <div class="select-list">
  19 + <ul>
  20 + <li>
  21 + 编码：<input type="text" name="code"/>
  22 + </li>
  23 + <li>
  24 + 入库单编码：<input type="text" name="referCode">
  25 + </li>
  26 + <li>状态：
  27 + <select name="lastStatus">
  28 + <option value="">所有</option>
  29 + <option value="0">新建</option>
  30 + </select>
  31 + </li>
  32 + <li class="time">
  33 + <label>创建时间： </label>
  34 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
  35 + <span>-</span>
  36 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
  37 + </li>
  38 + <li>
  39 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  40 + </li>
  41 + </ul>
  42 + </div>
  43 + </form>
  44 + </div>
  45 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  46 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
  47 + shiro:hasPermission="receipt:receiptHeader:add">
  48 + <i class="fa fa-plus"></i> 新增
  49 + </a>
  50 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
  51 + shiro:hasPermission="receipt:receiptHeader:remove">
  52 + <i class="fa fa-trash-o"></i> 删除
  53 + </a>
  54 + </div>
  55 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  56 + </div>
  57 +
  58 + <div class="tab-pane fade" id="tabDetail">
  59 + <table id="bootstrap-table1" data-mobile-responsive="true"
  60 + class="table table-bordered table-hover"></table>
  61 + </div>
  62 + </div>
  63 + </div>
  64 + </div>
  65 +</div>
  66 +<div th:include="include :: footer"></div>
  67 +<script th:inline="javascript">
  68 + var prefix = ctx + "check/checkHeader";
  69 + var prefix1 = ctx + "check/checkDetail";
  70 + var editFlag = [[${@permission.hasPermi('check:checkHeader:edit')}]];
  71 + var removeFlag = [[${@permission.hasPermi('check:checkHeader:remove')}]];
  72 + var receiptTypes = [[${@receiptTypeService.getType()}]];
  73 + var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
  74 + var printFlag = [[${@permission.hasPermi('check:checkHeader:report')}]];
  75 + var addFlag= [[${@permission.hasPermi('check:checkHeader:add')}]];
  76 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  77 +
  78 + $(function() {
  79 + var options = {
  80 + url: prefix + "/list",
  81 + createUrl: prefix + "/add",
  82 + updateUrl: prefix + "/edit/{id}",
  83 + removeUrl: prefix + "/remove",
  84 + modalName: "流程",
  85 + search: false,
  86 + sortName: "id",
  87 + sortOrder: "desc",
  88 + columns: [{
  89 + checkbox: true
  90 + },
  91 + {
  92 + field : 'id',
  93 + title : '入库单id'
  94 + },
  95 + {
  96 + field : 'code',
  97 + title : '编码'
  98 + },
  99 + {
  100 + field : 'referCode',
  101 + title : '关联单号'
  102 + },
  103 + {
  104 + field : 'referPlatform',
  105 + title : '关联平台'
  106 + },
  107 + {
  108 + field : 'enable',
  109 + title : '是否有效',
  110 + align: 'center',
  111 + formatter: function(value, row, index) {
  112 + return $.table.selectDictLabel(datas, value);
  113 + }
  114 + },
  115 + {
  116 + field : 'status',
  117 + title : '状态',
  118 + visible:false
  119 + },
  120 + {
  121 + field : 'closedBy',
  122 + title : '关闭人'
  123 + },
  124 + {
  125 + field : 'closedAt',
  126 + title : '关闭日期'
  127 + },
  128 + {
  129 + field : 'created',
  130 + title : '创建时间',
  131 + sortable:true,
  132 + visible:false
  133 + },
  134 + {
  135 + field : 'createdBy',
  136 + title : '创建用户',
  137 + visible:false
  138 + },
  139 + {
  140 + field : 'lastUpdated',
  141 + title : '最后修改时间',
  142 + sortable:true,
  143 + visible:false
  144 + },
  145 + {
  146 + field : 'lastUpdatedBy',
  147 + title : '更新用户',
  148 + visible:false
  149 + },
  150 + {
  151 + field : 'userDef1',
  152 + title : '自定义字段1',
  153 + visible: false
  154 + },
  155 + {
  156 + field : 'userDef2',
  157 + title : '自定义字段2',
  158 + visible: false
  159 + },
  160 + {
  161 + field : 'userDef3',
  162 + title : '自定义字段3' ,
  163 + visible: false
  164 + },
  165 + {
  166 + title: '操作',
  167 + align: 'center',
  168 + formatter: function(value, row, index) {
  169 + var actions = [];
  170 + actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-print"></i>完成</a> ');
  171 + actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  172 + // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  173 + return actions.join('');
  174 + }
  175 + }]
  176 + };
  177 + $.table.init(options);
  178 + });
  179 +
  180 + function detail(id, code) {
  181 + var url = prefix1+"/list/" + id;
  182 + createtable(url);
  183 + }
  184 +
  185 + function createtable(url) {
  186 + $("#tabDetail").children().remove();
  187 + $("#myTab li").removeClass("active");
  188 + var height = $(document).height()-100 + 'px';
  189 + var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
  190 + $("#tabDetail").append(str);
  191 + $(".tab-pane").removeClass("in active");
  192 + $("#myTab li:eq(1)").addClass("active");
  193 + $("#tabDetail").addClass("in active");
  194 + }
  195 +
  196 + function complete(id) {
  197 +
  198 + }
  199 +</script>
  200 +</body>
  201 +</html>
0 202 \ No newline at end of file
... ...