wms / wms_tianjinggelinmei · Commits

Commit ef9152a6b9bdcf1b3191b129d2883c30d28de586

Authored by mahuandong
2 parents 35c1e10f aafd763e
develop ... moreWarehouse

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
Inline Side-by-side
Showing 8 changed files with 350 additions and 741 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @ef9152a
1 1 package com.huaheng.pc.inventory.inventoryDetail.controller;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 7 import com.huaheng.common.utils.StringUtils;
  8 +import com.huaheng.common.utils.security.ShiroUtils;
4 9 import com.huaheng.framework.aspectj.lang.annotation.Log;
5 10 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
6 11 import com.huaheng.framework.web.controller.BaseController;
7 12 import com.huaheng.framework.web.domain.AjaxResult;
  13 +import com.huaheng.framework.web.page.PageDomain;
8 14 import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
9 16 import com.huaheng.pc.general.material.service.MaterialServiceImpl;
  17 +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
  18 +import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
  19 +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
10 20 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
11 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
12 22 import org.springframework.stereotype.Controller;
... ... @@ -16,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
16 26 import org.springframework.web.bind.annotation.ResponseBody;
17 27  
18 28 import javax.annotation.Resource;
  29 +import java.util.List;
19 30  
20 31 /**
21 32 * 库存明细控制层
... ... @@ -31,7 +42,8 @@ public class InventoryDetailController extends BaseController
31 42 private MaterialServiceImpl materialService;
32 43 @Resource
33 44 private InventoryHeaderService inventoryHeaderService;
34   -
  45 + @Resource
  46 + private InventoryDetailService inventoryDetailService;
35 47  
36 48  
37 49 //@RequiresPermissions("inventory:inventoryDetail:view")
... ... @@ -48,10 +60,40 @@ public class InventoryDetailController extends BaseController
48 60 @Log(title = "库存-库存明细查看",operating = "查看库存明细列表", action = BusinessType.GRANT)
49 61 @PostMapping("/inventoryDetailLook")
50 62 @ResponseBody
51   - public TableDataInfo list()
  63 + public TableDataInfo detailList(InventoryDetail inventoryDetail, String createdBegin, String createdEnd)
52 64 {
  65 + LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  66 + PageDomain pageDomain = TableSupport.buildPageRequest();
  67 + Integer pageNum = pageDomain.getPageNum();
  68 + Integer pageSize = pageDomain.getPageSize();
  69 +
  70 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),InventoryDetail::getCreated, createdBegin)
  71 + .le(StringUtils.isNotEmpty(createdEnd), InventoryDetail::getCreated, createdEnd)//创建时间范围
  72 + .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库
  73 + .eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
  74 + .eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
  75 + .eq(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()),InventoryDetail::getCompanyCode,inventoryDetail.getCompanyCode())//货主
  76 + .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码
  77 + .eq(StringUtils.isNotEmpty(inventoryDetail.getInventorySts()),InventoryDetail::getInventorySts,inventoryDetail.getInventorySts())//库存状态
  78 + .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
  79 + .eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
  80 + .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
  81 + //入库单编码
  82 + //入库单明细ID
  83 + .orderByDesc(InventoryDetail::getId);
53 84  
54   - return getDataTable(null);
  85 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  86 + //分页查询
  87 + Page<InventoryDetail> page = new Page<>(pageNum, pageSize);
  88 + IPage<InventoryDetail> iPage = inventoryDetailService.page(page, lambdaQueryWrapper);
  89 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  90 + } else {
  91 + List<InventoryDetail> list = inventoryDetailService.list(lambdaQueryWrapper);
  92 + return getDataTable(list);
  93 + }
55 94 }
  95 +
  96 +
  97 +
56 98  
57 99 }
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @ef9152a
... ... @@ -14,6 +14,7 @@ import com.huaheng.framework.web.page.PageDomain;
14 14 import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
16 16 import com.huaheng.pc.general.material.service.MaterialServiceImpl;
  17 +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
17 18 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
18 19 import org.apache.shiro.authz.annotation.RequiresPermissions;
19 20 import org.springframework.stereotype.Controller;
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
  View file @ef9152a
... ... @@ -350,41 +350,6 @@ public class ShipmentContainerDetail implements Serializable {
350 350 private String userDef3;
351 351  
352 352 /**
353   - * 自定义字段4
354   - */
355   - @TableField(value = "userDef4")
356   - @ApiModelProperty(value="自定义字段4")
357   - private String userDef4;
358   -
359   - /**
360   - * 自定义字段5
361   - */
362   - @TableField(value = "userDef5")
363   - @ApiModelProperty(value="自定义字段5")
364   - private String userDef5;
365   -
366   - /**
367   - * 自定义字段6
368   - */
369   - @TableField(value = "userDef6")
370   - @ApiModelProperty(value="自定义字段6")
371   - private String userDef6;
372   -
373   - /**
374   - * 自定义字段7
375   - */
376   - @TableField(value = "userDef7")
377   - @ApiModelProperty(value="自定义字段7")
378   - private String userDef7;
379   -
380   - /**
381   - * 自定义字段8
382   - */
383   - @TableField(value = "userDef8")
384   - @ApiModelProperty(value="自定义字段8")
385   - private String userDef8;
386   -
387   - /**
388 353 * 处理标记
389 354 */
390 355 @TableField(value = "processStamp")
... ... @@ -487,16 +452,6 @@ public class ShipmentContainerDetail implements Serializable {
487 452  
488 453 public static final String COL_USERDEF3 = "userDef3";
489 454  
490   - public static final String COL_USERDEF4 = "userDef4";
491   -
492   - public static final String COL_USERDEF5 = "userDef5";
493   -
494   - public static final String COL_USERDEF6 = "userDef6";
495   -
496   - public static final String COL_USERDEF7 = "userDef7";
497   -
498   - public static final String COL_USERDEF8 = "userDef8";
499   -
500 455 public static final String COL_PROCESSSTAMP = "processStamp";
501 456  
502 457 /**
... ... @@ -1334,95 +1289,6 @@ public class ShipmentContainerDetail implements Serializable {
1334 1289 this.userDef3 = userDef3;
1335 1290 }
1336 1291  
1337   - /**
1338   - * 获取自定义字段4
1339   - *
1340   - * @return userDef4 - 自定义字段4
1341   - */
1342   - public String getUserDef4() {
1343   - return userDef4;
1344   - }
1345   -
1346   - /**
1347   - * 设置自定义字段4
1348   - *
1349   - * @param userDef4 自定义字段4
1350   - */
1351   - public void setUserDef4(String userDef4) {
1352   - this.userDef4 = userDef4;
1353   - }
1354   -
1355   - /**
1356   - * 获取自定义字段5
1357   - *
1358   - * @return userDef5 - 自定义字段5
1359   - */
1360   - public String getUserDef5() {
1361   - return userDef5;
1362   - }
1363   -
1364   - /**
1365   - * 设置自定义字段5
1366   - *
1367   - * @param userDef5 自定义字段5
1368   - */
1369   - public void setUserDef5(String userDef5) {
1370   - this.userDef5 = userDef5;
1371   - }
1372   -
1373   - /**
1374   - * 获取自定义字段6
1375   - *
1376   - * @return userDef6 - 自定义字段6
1377   - */
1378   - public String getUserDef6() {
1379   - return userDef6;
1380   - }
1381   -
1382   - /**
1383   - * 设置自定义字段6
1384   - *
1385   - * @param userDef6 自定义字段6
1386   - */
1387   - public void setUserDef6(String userDef6) {
1388   - this.userDef6 = userDef6;
1389   - }
1390   -
1391   - /**
1392   - * 获取自定义字段7
1393   - *
1394   - * @return userDef7 - 自定义字段7
1395   - */
1396   - public String getUserDef7() {
1397   - return userDef7;
1398   - }
1399   -
1400   - /**
1401   - * 设置自定义字段7
1402   - *
1403   - * @param userDef7 自定义字段7
1404   - */
1405   - public void setUserDef7(String userDef7) {
1406   - this.userDef7 = userDef7;
1407   - }
1408   -
1409   - /**
1410   - * 获取自定义字段8
1411   - *
1412   - * @return userDef8 - 自定义字段8
1413   - */
1414   - public String getUserDef8() {
1415   - return userDef8;
1416   - }
1417   -
1418   - /**
1419   - * 设置自定义字段8
1420   - *
1421   - * @param userDef8 自定义字段8
1422   - */
1423   - public void setUserDef8(String userDef8) {
1424   - this.userDef8 = userDef8;
1425   - }
1426 1292  
1427 1293 /**
1428 1294 * 获取处理标记
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
  View file @ef9152a
... ... @@ -308,40 +308,6 @@ public class ShipmentContainerHeader implements Serializable {
308 308 @ApiModelProperty(value="自定义字段3")
309 309 private String userDef3;
310 310  
311   - /**
312   - * 自定义字段4
313   - */
314   - @TableField(value = "userDef4")
315   - @ApiModelProperty(value="自定义字段4")
316   - private String userDef4;
317   -
318   - /**
319   - * 自定义字段5
320   - */
321   - @TableField(value = "userDef5")
322   - @ApiModelProperty(value="自定义字段5")
323   - private String userDef5;
324   -
325   - /**
326   - * 自定义字段6
327   - */
328   - @TableField(value = "userDef6")
329   - @ApiModelProperty(value="自定义字段6")
330   - private String userDef6;
331   -
332   - /**
333   - * 自定义字段7
334   - */
335   - @TableField(value = "userDef7")
336   - @ApiModelProperty(value="自定义字段7")
337   - private String userDef7;
338   -
339   - /**
340   - * 自定义字段8
341   - */
342   - @TableField(value = "userDef8")
343   - @ApiModelProperty(value="自定义字段8")
344   - private String userDef8;
345 311  
346 312 /**
347 313 * 承运商
... ... @@ -475,16 +441,6 @@ public class ShipmentContainerHeader implements Serializable {
475 441  
476 442 public static final String COL_USERDEF3 = "userDef3";
477 443  
478   - public static final String COL_USERDEF4 = "userDef4";
479   -
480   - public static final String COL_USERDEF5 = "userDef5";
481   -
482   - public static final String COL_USERDEF6 = "userDef6";
483   -
484   - public static final String COL_USERDEF7 = "userDef7";
485   -
486   - public static final String COL_USERDEF8 = "userDef8";
487   -
488 444 public static final String COL_CARRIERCODE = "carrierCode";
489 445  
490 446 public static final String COL_SCALEDBY = "scaledBy";
... ... @@ -1228,96 +1184,6 @@ public class ShipmentContainerHeader implements Serializable {
1228 1184 }
1229 1185  
1230 1186 /**
1231   - * 获取自定义字段4
1232   - *
1233   - * @return userDef4 - 自定义字段4
1234   - */
1235   - public String getUserDef4() {
1236   - return userDef4;
1237   - }
1238   -
1239   - /**
1240   - * 设置自定义字段4
1241   - *
1242   - * @param userDef4 自定义字段4
1243   - */
1244   - public void setUserDef4(String userDef4) {
1245   - this.userDef4 = userDef4;
1246   - }
1247   -
1248   - /**
1249   - * 获取自定义字段5
1250   - *
1251   - * @return userDef5 - 自定义字段5
1252   - */
1253   - public String getUserDef5() {
1254   - return userDef5;
1255   - }
1256   -
1257   - /**
1258   - * 设置自定义字段5
1259   - *
1260   - * @param userDef5 自定义字段5
1261   - */
1262   - public void setUserDef5(String userDef5) {
1263   - this.userDef5 = userDef5;
1264   - }
1265   -
1266   - /**
1267   - * 获取自定义字段6
1268   - *
1269   - * @return userDef6 - 自定义字段6
1270   - */
1271   - public String getUserDef6() {
1272   - return userDef6;
1273   - }
1274   -
1275   - /**
1276   - * 设置自定义字段6
1277   - *
1278   - * @param userDef6 自定义字段6
1279   - */
1280   - public void setUserDef6(String userDef6) {
1281   - this.userDef6 = userDef6;
1282   - }
1283   -
1284   - /**
1285   - * 获取自定义字段7
1286   - *
1287   - * @return userDef7 - 自定义字段7
1288   - */
1289   - public String getUserDef7() {
1290   - return userDef7;
1291   - }
1292   -
1293   - /**
1294   - * 设置自定义字段7
1295   - *
1296   - * @param userDef7 自定义字段7
1297   - */
1298   - public void setUserDef7(String userDef7) {
1299   - this.userDef7 = userDef7;
1300   - }
1301   -
1302   - /**
1303   - * 获取自定义字段8
1304   - *
1305   - * @return userDef8 - 自定义字段8
1306   - */
1307   - public String getUserDef8() {
1308   - return userDef8;
1309   - }
1310   -
1311   - /**
1312   - * 设置自定义字段8
1313   - *
1314   - * @param userDef8 自定义字段8
1315   - */
1316   - public void setUserDef8(String userDef8) {
1317   - this.userDef8 = userDef8;
1318   - }
1319   -
1320   - /**
1321 1187 * 获取承运商
1322 1188 *
1323 1189 * @return carrierCode - 承运商
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
  View file @ef9152a
... ... @@ -295,41 +295,6 @@ public class ShipmentDetail implements Serializable {
295 295 private String userDef3;
296 296  
297 297 /**
298   - * 自定义字段4
299   - */
300   - @TableField(value = "userDef4")
301   - @ApiModelProperty(value="自定义字段4")
302   - private String userDef4;
303   -
304   - /**
305   - * 自定义字段5
306   - */
307   - @TableField(value = "userDef5")
308   - @ApiModelProperty(value="自定义字段5")
309   - private String userDef5;
310   -
311   - /**
312   - * 自定义字段6
313   - */
314   - @TableField(value = "userDef6")
315   - @ApiModelProperty(value="自定义字段6")
316   - private String userDef6;
317   -
318   - /**
319   - * 自定义字段7
320   - */
321   - @TableField(value = "userDef7")
322   - @ApiModelProperty(value="自定义字段7")
323   - private String userDef7;
324   -
325   - /**
326   - * 自定义字段8
327   - */
328   - @TableField(value = "userDef8")
329   - @ApiModelProperty(value="自定义字段8")
330   - private String userDef8;
331   -
332   - /**
333 298 * 处理标记
334 299 */
335 300 @TableField(value = "processStamp")
... ... @@ -416,16 +381,6 @@ public class ShipmentDetail implements Serializable {
416 381  
417 382 public static final String COL_USERDEF3 = "userDef3";
418 383  
419   - public static final String COL_USERDEF4 = "userDef4";
420   -
421   - public static final String COL_USERDEF5 = "userDef5";
422   -
423   - public static final String COL_USERDEF6 = "userDef6";
424   -
425   - public static final String COL_USERDEF7 = "userDef7";
426   -
427   - public static final String COL_USERDEF8 = "userDef8";
428   -
429 384 public static final String COL_PROCESSSTAMP = "processStamp";
430 385  
431 386 /**
... ... @@ -1118,95 +1073,6 @@ public class ShipmentDetail implements Serializable {
1118 1073 this.userDef3 = userDef3;
1119 1074 }
1120 1075  
1121   - /**
1122   - * 获取自定义字段4
1123   - *
1124   - * @return userDef4 - 自定义字段4
1125   - */
1126   - public String getUserDef4() {
1127   - return userDef4;
1128   - }
1129   -
1130   - /**
1131   - * 设置自定义字段4
1132   - *
1133   - * @param userDef4 自定义字段4
1134   - */
1135   - public void setUserDef4(String userDef4) {
1136   - this.userDef4 = userDef4;
1137   - }
1138   -
1139   - /**
1140   - * 获取自定义字段5
1141   - *
1142   - * @return userDef5 - 自定义字段5
1143   - */
1144   - public String getUserDef5() {
1145   - return userDef5;
1146   - }
1147   -
1148   - /**
1149   - * 设置自定义字段5
1150   - *
1151   - * @param userDef5 自定义字段5
1152   - */
1153   - public void setUserDef5(String userDef5) {
1154   - this.userDef5 = userDef5;
1155   - }
1156   -
1157   - /**
1158   - * 获取自定义字段6
1159   - *
1160   - * @return userDef6 - 自定义字段6
1161   - */
1162   - public String getUserDef6() {
1163   - return userDef6;
1164   - }
1165   -
1166   - /**
1167   - * 设置自定义字段6
1168   - *
1169   - * @param userDef6 自定义字段6
1170   - */
1171   - public void setUserDef6(String userDef6) {
1172   - this.userDef6 = userDef6;
1173   - }
1174   -
1175   - /**
1176   - * 获取自定义字段7
1177   - *
1178   - * @return userDef7 - 自定义字段7
1179   - */
1180   - public String getUserDef7() {
1181   - return userDef7;
1182   - }
1183   -
1184   - /**
1185   - * 设置自定义字段7
1186   - *
1187   - * @param userDef7 自定义字段7
1188   - */
1189   - public void setUserDef7(String userDef7) {
1190   - this.userDef7 = userDef7;
1191   - }
1192   -
1193   - /**
1194   - * 获取自定义字段8
1195   - *
1196   - * @return userDef8 - 自定义字段8
1197   - */
1198   - public String getUserDef8() {
1199   - return userDef8;
1200   - }
1201   -
1202   - /**
1203   - * 设置自定义字段8
1204   - *
1205   - * @param userDef8 自定义字段8
1206   - */
1207   - public void setUserDef8(String userDef8) {
1208   - this.userDef8 = userDef8;
1209   - }
1210 1076  
1211 1077 /**
1212 1078 * 获取处理标记
... ...
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html 0 → 100644
  View file @ef9152a
  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="col-sm-12 select-info">
  9 + <form id="inventory-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 库位编号：<input type="text" name="locationCode"/>
  14 + </li>
  15 + <li>
  16 + 容器编号：<input type="text" name="containerCode"/>
  17 + </li>
  18 + <li>
  19 + 存货编码：<input type="text" name="materialCode"/>
  20 + </li>
  21 + <li>
  22 + 存货代码：<input type="text" name="materialOldCode"/>
  23 + </li>
  24 + <li>
  25 + 物料名称：<input type="text" name="materialName"/>
  26 + </li>
  27 + <li>
  28 + 库存状态：
  29 + <select name="status" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
  30 + <option value="">所有</option>
  31 + <option th:each="e : ${inventoryStatus}" th:text="${e['dictLabel']}"
  32 + th:value="${e['dictValue']}"></option>
  33 + </select>
  34 + </li>
  35 + <li>
  36 + 供应商编码：<input type="text" name="supplierCode"/>
  37 + </li>
  38 +
  39 + <li>
  40 + 项 目 号：<input type="text" name="project"/>
  41 + </li>
  42 + <li>
  43 + 物料规格：<input type="text" name="materialSpec"/>
  44 + </li>
  45 + <li class="time" style="height:30px">
  46 + <label>创建时间： </label>
  47 + <input type="text" class="time-input" id="startTime" placeholder="开始时间"
  48 + name="params[createdBegin]"/>
  49 + <span>-</span>
  50 + <input type="text" class="time-input" id="endTime" placeholder="结束时间"
  51 + name="params[createdEnd]"/>
  52 + </li>
  53 + <li>
  54 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  55 + class="fa fa-search"></i>&nbsp;搜索</a>
  56 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="general:inventory:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  57 + </li>
  58 + </ul>
  59 + </div>
  60 + </form>
  61 + </div>
  62 + <div class="col-sm-12 select-info">
  63 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  64 + </div>
  65 + </div>
  66 +</div>
  67 +<div th:include="include :: footer"></div>
  68 +<script th:inline="javascript">
  69 + var editFlag = [[${@permission.hasPermi('inventory:inventory:edit')}]];
  70 + var removeFlag = [[${@permission.hasPermi('inventory:inventory:remove')}]];
  71 + var prefix = ctx + "inventory/inventoryDetail"
  72 + var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
  73 + $(function () {
  74 + var options = {
  75 + url: prefix + "/inventoryDetailLook",
  76 + createUrl: prefix + "/add",
  77 + updateUrl: prefix + "/edit/{id}",
  78 + removeUrl: prefix + "/remove",
  79 + modalName: "库存明细",
  80 + sortable: true, // 是否启用排序
  81 + sortStable: true, // 设置为 true 将获得稳定的排序
  82 + sortName: "id",
  83 + sortOrder: "desc",
  84 + search: false,
  85 + columns: [
  86 + {
  87 + checkbox: true
  88 + },
  89 + {
  90 + field: 'id',
  91 + title: '明细ID',
  92 + sortable: true
  93 + },
  94 + {
  95 + field: 'inventoryHeaderId',
  96 + title: '库存头ID'
  97 + },
  98 + {
  99 + field: 'locationCode',
  100 + title: '库位编号'
  101 + },
  102 + {
  103 + field: 'containerCode',
  104 + title: '容器编号'
  105 + },
  106 +
  107 + {
  108 + field: 'materialCode',
  109 + title: '存货编码'
  110 + },
  111 +
  112 + {
  113 + field: 'materialName',
  114 + title: '物料名称'
  115 + },
  116 + {
  117 + field: 'materialSpec',
  118 + title: '物料规格'
  119 + },
  120 + {
  121 + field: 'materialUnit',
  122 + title: '物料单位'
  123 + },
  124 + {
  125 + field: 'qty',
  126 + title: '数量'
  127 + },
  128 + {
  129 + field: 'taskQty',
  130 + title: '预定执行数量'
  131 + },
  132 + {
  133 + field: 'lockedQty',
  134 + title: '冻结数量'
  135 + },
  136 + {
  137 + field: 'companyCode',
  138 + title: '货主编码'
  139 + },
  140 + {
  141 + field: 'receiptCode',
  142 + title: '入库单编码'
  143 + },
  144 + {
  145 + field: 'receiptDetailId',
  146 + title: '入库单明细ID',
  147 + visible: true
  148 + },
  149 + {
  150 + field: 'batch',
  151 + title: '批次',
  152 + sortable: false,
  153 + visible: false
  154 + },
  155 + {
  156 + field: 'lot',
  157 + title: '批号',
  158 + sortable: false,
  159 + visible: false
  160 + },
  161 + {
  162 + field: 'projectNo',
  163 + title: '项目号',
  164 + sortable: true
  165 + },
  166 + {
  167 + field: 'supplierCode',
  168 + title: '供应商编码',
  169 + visible: true
  170 + },
  171 + {
  172 + field: 'manufactureDate',
  173 + title: '生产日期',
  174 + sortable: true,
  175 + visible: false
  176 + },
  177 + {
  178 + field: 'expirationDate',
  179 + title: '失效日期',
  180 + sortable: true,
  181 + visible: false
  182 + },
  183 + {
  184 + field: 'inventorySts',
  185 + title: '库存状态',
  186 + align: 'center',
  187 + formatter: function (value, row, index) {
  188 + return $.table.selectDictLabel(inventoryStatus, value);
  189 + }
  190 + },
  191 +
  192 + {
  193 + field: 'referCode',
  194 + title: '上游单号'
  195 + },
  196 + {
  197 + field: 'referDetailId',
  198 + title: '上游单号行号'
  199 + },
  200 + {
  201 + field: 'qcCheck',
  202 + title: '质检'
  203 + },
  204 + {
  205 + field: 'weight',
  206 + title: '重量'
  207 + },
  208 + {
  209 + field: 'attributeId',
  210 + title: '属性号',
  211 + visible: false
  212 + },
  213 + {
  214 + field: 'attribute1',
  215 + title: '属性1',
  216 + visible: false
  217 + },
  218 + {
  219 + field: 'attribute2',
  220 + title: '属性2',
  221 + visible: false
  222 + },
  223 + {
  224 + field: 'attribute3',
  225 + title: '属性3',
  226 + visible: false
  227 + },
  228 + {
  229 + field: 'lockCode',
  230 + title: '锁',
  231 + },
  232 + {
  233 + field: 'lastCycleCountDate',
  234 + title: '上次盘点日期',
  235 + visible: false,
  236 + sortable: true
  237 + },
  238 + {
  239 + field: 'created',
  240 + title: '入库日期',
  241 + sortable: true
  242 + },
  243 + {
  244 + field: 'createdBy',
  245 + title: '创建用户',
  246 + visible: false
  247 + },
  248 + {
  249 + field: 'lastUpdated',
  250 + title: '最后修改时间',
  251 + sortable: true
  252 + },
  253 + {
  254 + field: 'lastUpdatedBy',
  255 + title: '更新用户'
  256 + },
  257 + {
  258 + field: 'userDef1',
  259 + title: '自定义字段1',
  260 + visible: false
  261 + },
  262 + {
  263 + field: 'userDef2',
  264 + title: '自定义字段2',
  265 + visible: false
  266 + },
  267 + {
  268 + field: 'userDef3',
  269 + title: '自定义字段3',
  270 + visible: false
  271 + }
  272 + ]
  273 + };
  274 + $.table.init(options);
  275 + });
  276 +
  277 + function localSubmit(url, type, dataType, data) {
  278 + $.modal.loading("正在处理中，请稍后...");
  279 + var config = {
  280 + url: url, type: type, dataType: dataType, data: data, success: function (result) {
  281 + if (result.code == web_status.SUCCESS) {
  282 + $.modal.msgSuccess(result.msg);
  283 + } else {
  284 + $.modal.alertError(result.msg)
  285 + }
  286 + $.modal.closeLoading()
  287 + }
  288 + };
  289 + $.ajax(config)
  290 + }
  291 +
  292 +</script>
  293 +</body>
  294 +</html>
0 295 \ No newline at end of file
... ...
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
  View file @ef9152a
... ... @@ -140,19 +140,18 @@
140 140 },
141 141 {
142 142 field : 'projectNos',
143   - title : ' 项目号列表'
  143 + title : ' 项目号列表',
  144 + visible: false
144 145 },
145 146 {
146 147 field : 'batchs',
147   - title : ' 批次列表'
  148 + title : ' 批次列表',
  149 + visible: false
148 150 },
149 151 {
150 152 field : 'lots',
151   - title : ' 批号列表'
152   - },
153   - {
154   - field : 'lastCycleCountDate',
155   - title : ' 上次盘点日期'
  153 + title : ' 批号列表',
  154 + visible: false
156 155 },
157 156 {
158 157 field : 'lock',
... ... @@ -206,9 +205,9 @@
206 205 });
207 206  
208 207 function detail(id) {
209   - let url= ctx + "shipment/shipmentHeader"; //网页地址
  208 + let url= ctx + "inventory/inventoryDetail"; //明细网页地址
210 209 if (id){
211   - url = ctx +"inventory/inventoryDetail?id="+id;
  210 + url = ctx +"inventoryDetail/inventoryDetail?id="+id;
212 211 }
213 212 $("#tabDetail").children().remove();
214 213 $("#myTab li").removeClass("active");
... ... @@ -223,31 +222,14 @@
223 222  
224 223 function cyclecountPrint(id) {
225 224 var url = prefix + "/report/" + id;
226   - $.modal.open("差异单打印" , url);
  225 + $.modal.open("打印" , url);
227 226 }
228 227  
229 228 $("#myTab li:eq(1)").click(function () {
230 229 detail();
231 230 });
232 231  
233   - // function upLoad(code,sourceCode) {
234   - // $.ajax({
235   - // url:ctx+'/api/icsCyclecount/cycleCountDiff',
236   - // type:'post',
237   - // data:{
238   - // code:code,
239   - // sourceCode:sourceCode
240   - // },
241   - // success:function (res) {
242   - // if (res.code === 200) {
243   - // $.modal.msgSuccess();
244   - // }
245   - // else {
246   - // $.modal.msgError(res.msg);
247   - // }
248   - // }
249   - // })
250   - // }
  232 +
251 233 </script>
252 234 </body>
253 235 </html>
254 236 \ No newline at end of file
... ...
src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html deleted
View file @35c1e10
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="white-bg">
6   -<div class="row">
7   - <div class="col-sm-12">
8   - <div class="col-sm-12 select-info">
9   - <div class="select-list" th:object="${header}">
10   - <ul>
11   - <li>
12   - <form id="cycleHeader-form">
13   - 差异单ID：<input type="text" id="cyclecountAdjustId" name="cyclecountAdjustId"
14   - readonly="readonly">
15   - </form>
16   - </li>
17   - <li>
18   - 货主编码：<input id="companyCode" type="text" name="companyCode" readonly="readonly"/>
19   - </li>
20   - <li>
21   - 调整单编码：<input id="code" type="text" name="code" readonly="readonly"/>
22   - </li>
23   - <li>
24   - 源盘点单号：<input id="sourceCode" type="text" name="sourceCode" readonly="readonly">
25   - </li>
26   - <!-- <li>
27   - &lt;!&ndash;头 状 态：<input type="text" name="firstStatus"/>&ndash;&gt;
28   - 状态：<input id = "status" type="text" name="status" th:value="*{statusLabel}" readonly="readonly">
29   - </li>-->
30   - <li>
31   - 调整单状态：<input id="status" type="text" name="status" readonly="readonly">
32   - </li>
33   - <li>
34   - 创建时间：<input id="created" type="text" name="created" readonly="readonly">
35   -
36   - </li>
37   - <li>
38   - 创建人：<input id="createdBy" type="text" name="createdBy" readonly="readonly">
39   - </li>
40   - <li>
41   - 最后更新时间：<input id="lastUpdated" type="text" name="lastUpdated" readonly="readonly">
42   -
43   - </li>
44   - <li>
45   - 最后更新人：<input id="lastUpdatedBy" type="text" name="lastUpdatedBy" readonly="readonly">
46   - </li>
47   - <li>
48   - <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
49   - class="fa fa-search"></i>&nbsp;搜索</a>
50   - </li>
51   - </ul>
52   - </div>
53   - </div>
54   - <div class="btn-group hidden-xs" id="toolbar" role="group">
55   - <a class="btn btn-outline btn-success btn-rounded" onclick="update()">
56   - <i class="fa fa-refresh"></i>刷新
57   - </a>
58   - </div>
59   - <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
60   - </div>
61   -</div>
62   -<div th:include="include :: footer"></div>
63   -<script th:inline="javascript">
64   - var prefix = ctx + "inventory/inventoryDetail";
65   - var prefix_head = ctx + "inventory/inventoryHeader";
66   - var datas = [[${@dict.getType('adjustType')}]];
67   - var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
68   -
69   - var created;
70   -
71   -
72   - $(function () {
73   - var options = {
74   - url: prefix + "/inventoryDetailLook",
75   - /* createUrl: prefix + "/add",
76   - updateUrl: prefix + "/edit/{id}",
77   - removeUrl: prefix + "/remove",*/
78   - modalName: "差异单明细",
79   - sortName: "id",
80   - sortOrder: "desc",
81   - showRefresh: false,
82   - search: false,
83   - // pagination:false,
84   - columns: [
85   - {
86   - radio: true
87   - },
88   - {
89   - field: 'id',
90   - title: '明细Id',
91   - sortable: true
92   - },
93   -
94   - {
95   - field: '',
96   - title: '',
97   - sortable: true,
98   - visible: false
99   - },
100   - {
101   - field: 'locationCode',
102   - title: '库位编号',
103   - },
104   - {
105   - field: 'containerCode',
106   - title: '容器编号',
107   - },
108   - {
109   - field: 'materialCode',
110   - title: '物料编码',
111   -
112   - },
113   - {
114   - field: 'materialName',
115   - title: '物料名称',
116   -
117   - },
118   - {
119   - field: 'materialSpecification',
120   - title: '物料规格',
121   -
122   - },
123   - {
124   - field: 'receiptCode',
125   - title: '入库单编码'
126   - },
127   - {
128   - field: 'receiptId',
129   - title: '入库单id',
130   - sortable: true,
131   - visible: false
132   - },
133   - {
134   - field: 'receiptDetailId',
135   - title: '入库单明细id',
136   - sortable: true,
137   - visible: false
138   - },
139   - {
140   - field: 'qty',
141   - title: '数量'
142   - },
143   - {
144   - field: 'batch',
145   - title: '批次',
146   - sortable: true,
147   - sortable: true
148   - },
149   - {
150   - field: 'lot',
151   - title: '批号',
152   - sortable: true,
153   - sortable: true
154   - },
155   - {
156   - field: 'project',
157   - title: '项目号',
158   - sortable: true,
159   - sortable: true
160   - },
161   - {
162   - field: 'manufactureDate',
163   - title: '生产日期',
164   - sortable: true,
165   - visible: false
166   -
167   - },
168   - {
169   - field: 'expirationDate',
170   - title: '失效日期',
171   - sortable: true,
172   - visible: false
173   - },
174   - {
175   - field: 'inventoryStatus',
176   - title: '库存状态',
177   - formatter: function (value, row, index) {
178   - return $.table.selectDictLabel(inventoryStatus, value);
179   - },
180   - sortable: true
181   - },
182   -
183   - {
184   - field: 'created',
185   - title: '创建时间',
186   - sortable: true
187   - },
188   - {
189   - field: 'createdBy',
190   - title: '创建用户'
191   - },
192   - {
193   - field: 'lastUpdated',
194   - title: '更新时间',
195   - sortable: true
196   - },
197   - {
198   - field: 'lastUpdatedBy',
199   - title: '更新用户'
200   - },
201   - {
202   - field: 'fromSource',
203   - title: '物料来源'
204   - },
205   - {
206   - field: 'status',
207   - title: '明细状态',
208   - formatter: function (value, row, index) {
209   - return $.table.selectDictLabel(datas, value);
210   - },
211   - sortable: true
212   - },
213   - ]
214   - };
215   - $.table.init(options);
216   - update();
217   - });
218   -
219   - function update() {
220   - var url = location.search; //获取url中"?"符后的字串
221   - if (url.indexOf("?") != -1) { //判断是否有参数
222   - var str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
223   - strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
224   - $.ajax({
225   - url: prefix + "/list",//
226   - type: "post",
227   - data: {
228   - id: strs[1]
229   - },
230   - success: function (res) {
231   - $("#bootstrap-table").bootstrapTable('removeAll');
232   - // $("#bootstrap-table").bootstrapTable('append', res.data);
233   - for (var i = 0; i < res.data.length; i++) {
234   - $("#bootstrap-table").bootstrapTable('insertRow', {index: i, row: res.data[i]});
235   -
236   - }
237   - }
238   - })
239   - }
240   - else{
241   - $.ajax({
242   - url:ctx+"",
243   - type:"post",
244   - data:{},
245   - success:function (res) {
246   - $("#bootstrap-table").bootstrapTable('load',res.data)
247   - }
248   - })
249   - }
250   -
251   - // $.ajax({
252   - // url:prefix_head+ "/getHeader",
253   - // type:"post",
254   - // data:{
255   - // id:$('#cyclecountAdjustId').val()
256   - // },
257   - // success:function (value) {
258   - // if (value.data) {
259   - // $('#code').val(value.data.code);
260   - // // $('#type').val(value.data.typeLabel);
261   - // $('#status').val(value.data.statusLabel);
262   - // $('#created').val(value.data.created);
263   - // var text_val=$('#created').val();
264   - // $('#created').val(text_val.replace("T"," "));
265   - // //$('#createdBy').val(value.data.createdBy);
266   - // $('#lastUpdated').val(value.data.lastUpdated);
267   - // var text_val_t=$('#lastUpdated').val();
268   - // $('#lastUpdated').val(text_val_t.replace("T"," "));
269   - // //$('#lastUpdatedBy').val(value.data.lastUpdatedBy);
270   - // }
271   - // }
272   - // })
273   - }
274   -
275   - function open(title, url, width, height) {
276   - if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {
277   - width = 'auto';
278   - height = 'auto';
279   - }
280   - if (title == null) {
281   - title = false;
282   - }
283   - if (url == null) {
284   - url = "404.html";
285   - }
286   - if ($.common.isEmpty(width)) {
287   - width = 800;
288   - // width = ($(window).width() - 100);
289   - }
290   - if ($.common.isEmpty(height)) {
291   - height = ($(window).height() - 50);
292   - }
293   - layer.open({
294   - type: 2,
295   - area: [width + 'px', height + 'px'],
296   - fix: false,
297   - //不固定
298   - maxmin: true,
299   - shade: 0.3,
300   - title: title,
301   - content: url
302   - // shadeClose: true, //点击遮罩关闭层
303   - })
304   - }
305   -
306   -</script>
307   -</body>
308   -</html>
309 0 \ No newline at end of file