diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
index 784e48b..85997cb 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -1,12 +1,22 @@
package com.huaheng.pc.inventory.inventoryDetail.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.aspectj.lang.annotation.Log;
import com.huaheng.framework.aspectj.lang.constant.BusinessType;
import com.huaheng.framework.web.controller.BaseController;
import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.general.material.service.MaterialServiceImpl;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -16,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import java.util.List;
/**
* 库存明细控制层
@@ -31,7 +42,8 @@ public class InventoryDetailController extends BaseController
private MaterialServiceImpl materialService;
@Resource
private InventoryHeaderService inventoryHeaderService;
-
+ @Resource
+ private InventoryDetailService inventoryDetailService;
//@RequiresPermissions("inventory:inventoryDetail:view")
@@ -48,10 +60,40 @@ public class InventoryDetailController extends BaseController
@Log(title = "库存-库存明细查看",operating = "查看库存明细列表", action = BusinessType.GRANT)
@PostMapping("/inventoryDetailLook")
@ResponseBody
- public TableDataInfo list()
+ public TableDataInfo detailList(InventoryDetail inventoryDetail, String createdBegin, String createdEnd)
{
+ LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),InventoryDetail::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), InventoryDetail::getCreated, createdEnd)//创建时间范围
+ .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()),InventoryDetail::getCompanyCode,inventoryDetail.getCompanyCode())//货主
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getInventorySts()),InventoryDetail::getInventorySts,inventoryDetail.getInventorySts())//库存状态
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
+ //入库单编码
+ //入库单明细ID
+ .orderByDesc(InventoryDetail::getId);
- return getDataTable(null);
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ //分页查询
+ Page<InventoryDetail> page = new Page<>(pageNum, pageSize);
+ IPage<InventoryDetail> iPage = inventoryDetailService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+ } else {
+ List<InventoryDetail> list = inventoryDetailService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
}
+
+
+
}
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
index 95e76d0..a18a733 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
@@ -14,6 +14,7 @@ import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.general.material.service.MaterialServiceImpl;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
index 9660f1c..975151d 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
@@ -350,41 +350,6 @@ public class ShipmentContainerDetail implements Serializable {
private String userDef3;
/**
- * 自定义字段4
- */
- @TableField(value = "userDef4")
- @ApiModelProperty(value="自定义字段4")
- private String userDef4;
-
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
-
- /**
* 处理标记
*/
@TableField(value = "processStamp")
@@ -487,16 +452,6 @@ public class ShipmentContainerDetail implements Serializable {
public static final String COL_USERDEF3 = "userDef3";
- public static final String COL_USERDEF4 = "userDef4";
-
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
public static final String COL_PROCESSSTAMP = "processStamp";
/**
@@ -1334,95 +1289,6 @@ public class ShipmentContainerDetail implements Serializable {
this.userDef3 = userDef3;
}
- /**
- * 获取自定义字段4
- *
- * @return userDef4 - 自定义字段4
- */
- public String getUserDef4() {
- return userDef4;
- }
-
- /**
- * 设置自定义字段4
- *
- * @param userDef4 自定义字段4
- */
- public void setUserDef4(String userDef4) {
- this.userDef4 = userDef4;
- }
-
- /**
- * 获取自定义字段5
- *
- * @return userDef5 - 自定义字段5
- */
- public String getUserDef5() {
- return userDef5;
- }
-
- /**
- * 设置自定义字段5
- *
- * @param userDef5 自定义字段5
- */
- public void setUserDef5(String userDef5) {
- this.userDef5 = userDef5;
- }
-
- /**
- * 获取自定义字段6
- *
- * @return userDef6 - 自定义字段6
- */
- public String getUserDef6() {
- return userDef6;
- }
-
- /**
- * 设置自定义字段6
- *
- * @param userDef6 自定义字段6
- */
- public void setUserDef6(String userDef6) {
- this.userDef6 = userDef6;
- }
-
- /**
- * 获取自定义字段7
- *
- * @return userDef7 - 自定义字段7
- */
- public String getUserDef7() {
- return userDef7;
- }
-
- /**
- * 设置自定义字段7
- *
- * @param userDef7 自定义字段7
- */
- public void setUserDef7(String userDef7) {
- this.userDef7 = userDef7;
- }
-
- /**
- * 获取自定义字段8
- *
- * @return userDef8 - 自定义字段8
- */
- public String getUserDef8() {
- return userDef8;
- }
-
- /**
- * 设置自定义字段8
- *
- * @param userDef8 自定义字段8
- */
- public void setUserDef8(String userDef8) {
- this.userDef8 = userDef8;
- }
/**
* 获取处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
index 0d974cd..7cd956e 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
@@ -308,40 +308,6 @@ public class ShipmentContainerHeader implements Serializable {
@ApiModelProperty(value="自定义字段3")
private String userDef3;
- /**
- * 自定义字段4
- */
- @TableField(value = "userDef4")
- @ApiModelProperty(value="自定义字段4")
- private String userDef4;
-
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
/**
* 承运商
@@ -475,16 +441,6 @@ public class ShipmentContainerHeader implements Serializable {
public static final String COL_USERDEF3 = "userDef3";
- public static final String COL_USERDEF4 = "userDef4";
-
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
public static final String COL_CARRIERCODE = "carrierCode";
public static final String COL_SCALEDBY = "scaledBy";
@@ -1228,96 +1184,6 @@ public class ShipmentContainerHeader implements Serializable {
}
/**
- * 获取自定义字段4
- *
- * @return userDef4 - 自定义字段4
- */
- public String getUserDef4() {
- return userDef4;
- }
-
- /**
- * 设置自定义字段4
- *
- * @param userDef4 自定义字段4
- */
- public void setUserDef4(String userDef4) {
- this.userDef4 = userDef4;
- }
-
- /**
- * 获取自定义字段5
- *
- * @return userDef5 - 自定义字段5
- */
- public String getUserDef5() {
- return userDef5;
- }
-
- /**
- * 设置自定义字段5
- *
- * @param userDef5 自定义字段5
- */
- public void setUserDef5(String userDef5) {
- this.userDef5 = userDef5;
- }
-
- /**
- * 获取自定义字段6
- *
- * @return userDef6 - 自定义字段6
- */
- public String getUserDef6() {
- return userDef6;
- }
-
- /**
- * 设置自定义字段6
- *
- * @param userDef6 自定义字段6
- */
- public void setUserDef6(String userDef6) {
- this.userDef6 = userDef6;
- }
-
- /**
- * 获取自定义字段7
- *
- * @return userDef7 - 自定义字段7
- */
- public String getUserDef7() {
- return userDef7;
- }
-
- /**
- * 设置自定义字段7
- *
- * @param userDef7 自定义字段7
- */
- public void setUserDef7(String userDef7) {
- this.userDef7 = userDef7;
- }
-
- /**
- * 获取自定义字段8
- *
- * @return userDef8 - 自定义字段8
- */
- public String getUserDef8() {
- return userDef8;
- }
-
- /**
- * 设置自定义字段8
- *
- * @param userDef8 自定义字段8
- */
- public void setUserDef8(String userDef8) {
- this.userDef8 = userDef8;
- }
-
- /**
* 获取承运商
*
* @return carrierCode - 承运商
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
index 29039e4..50a080e 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
@@ -295,41 +295,6 @@ public class ShipmentDetail implements Serializable {
private String userDef3;
/**
- * 自定义字段4
- */
- @TableField(value = "userDef4")
- @ApiModelProperty(value="自定义字段4")
- private String userDef4;
-
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
-
- /**
* 处理标记
*/
@TableField(value = "processStamp")
@@ -416,16 +381,6 @@ public class ShipmentDetail implements Serializable {
public static final String COL_USERDEF3 = "userDef3";
- public static final String COL_USERDEF4 = "userDef4";
-
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
public static final String COL_PROCESSSTAMP = "processStamp";
/**
@@ -1118,95 +1073,6 @@ public class ShipmentDetail implements Serializable {
this.userDef3 = userDef3;
}
- /**
- * 获取自定义字段4
- *
- * @return userDef4 - 自定义字段4
- */
- public String getUserDef4() {
- return userDef4;
- }
-
- /**
- * 设置自定义字段4
- *
- * @param userDef4 自定义字段4
- */
- public void setUserDef4(String userDef4) {
- this.userDef4 = userDef4;
- }
-
- /**
- * 获取自定义字段5
- *
- * @return userDef5 - 自定义字段5
- */
- public String getUserDef5() {
- return userDef5;
- }
-
- /**
- * 设置自定义字段5
- *
- * @param userDef5 自定义字段5
- */
- public void setUserDef5(String userDef5) {
- this.userDef5 = userDef5;
- }
-
- /**
- * 获取自定义字段6
- *
- * @return userDef6 - 自定义字段6
- */
- public String getUserDef6() {
- return userDef6;
- }
-
- /**
- * 设置自定义字段6
- *
- * @param userDef6 自定义字段6
- */
- public void setUserDef6(String userDef6) {
- this.userDef6 = userDef6;
- }
-
- /**
- * 获取自定义字段7
- *
- * @return userDef7 - 自定义字段7
- */
- public String getUserDef7() {
- return userDef7;
- }
-
- /**
- * 设置自定义字段7
- *
- * @param userDef7 自定义字段7
- */
- public void setUserDef7(String userDef7) {
- this.userDef7 = userDef7;
- }
-
- /**
- * 获取自定义字段8
- *
- * @return userDef8 - 自定义字段8
- */
- public String getUserDef8() {
- return userDef8;
- }
-
- /**
- * 设置自定义字段8
- *
- * @param userDef8 自定义字段8
- */
- public void setUserDef8(String userDef8) {
- this.userDef8 = userDef8;
- }
/**
* 获取处理标记
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
new file mode 100644
index 0000000..6c6501a
--- /dev/null
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 select-info">
+ <form id="inventory-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ 库位编号：<input type="text" name="locationCode"/>
+ </li>
+ <li>
+ 容器编号：<input type="text" name="containerCode"/>
+ </li>
+ <li>
+ 存货编码：<input type="text" name="materialCode"/>
+ </li>
+ <li>
+ 存货代码：<input type="text" name="materialOldCode"/>
+ </li>
+ <li>
+ 物料名称：<input type="text" name="materialName"/>
+ </li>
+ <li>
+ 库存状态：
+ <select name="status" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
+ <option value="">所有</option>
+ <option th:each="e : ${inventoryStatus}" th:text="${e['dictLabel']}"
+ th:value="${e['dictValue']}"></option>
+ </select>
+ </li>
+ <li>
+ 供应商编码：<input type="text" name="supplierCode"/>
+ </li>
+
+ <li>
+ 项 目 号：<input type="text" name="project"/>
+ </li>
+ <li>
+ 物料规格：<input type="text" name="materialSpec"/>
+ </li>
+ <li class="time" style="height:30px">
+ <label>创建时间： </label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+ name="params[createdBegin]"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+ name="params[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-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="general:inventory:export"><i class="fa fa-download"></i> 导出</a>-->
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div class="col-sm-12 select-info">
+ <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+ </div>
+ </div>
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+ var editFlag = [[${@permission.hasPermi('inventory:inventory:edit')}]];
+ var removeFlag = [[${@permission.hasPermi('inventory:inventory:remove')}]];
+ var prefix = ctx + "inventory/inventoryDetail"
+ var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
+ $(function () {
+ var options = {
+ url: prefix + "/inventoryDetailLook",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ modalName: "库存明细",
+ sortable: true, // 是否启用排序
+ sortStable: true, // 设置为 true 将获得稳定的排序
+ sortName: "id",
+ sortOrder: "desc",
+ search: false,
+ columns: [
+ {
+ checkbox: true
+ },
+ {
+ field: 'id',
+ title: '明细ID',
+ sortable: true
+ },
+ {
+ field: 'inventoryHeaderId',
+ title: '库存头ID'
+ },
+ {
+ field: 'locationCode',
+ title: '库位编号'
+ },
+ {
+ field: 'containerCode',
+ title: '容器编号'
+ },
+
+ {
+ field: 'materialCode',
+ title: '存货编码'
+ },
+
+ {
+ field: 'materialName',
+ title: '物料名称'
+ },
+ {
+ field: 'materialSpec',
+ title: '物料规格'
+ },
+ {
+ field: 'materialUnit',
+ title: '物料单位'
+ },
+ {
+ field: 'qty',
+ title: '数量'
+ },
+ {
+ field: 'taskQty',
+ title: '预定执行数量'
+ },
+ {
+ field: 'lockedQty',
+ title: '冻结数量'
+ },
+ {
+ field: 'companyCode',
+ title: '货主编码'
+ },
+ {
+ field: 'receiptCode',
+ title: '入库单编码'
+ },
+ {
+ field: 'receiptDetailId',
+ title: '入库单明细ID',
+ visible: true
+ },
+ {
+ field: 'batch',
+ title: '批次',
+ sortable: false,
+ visible: false
+ },
+ {
+ field: 'lot',
+ title: '批号',
+ sortable: false,
+ visible: false
+ },
+ {
+ field: 'projectNo',
+ title: '项目号',
+ sortable: true
+ },
+ {
+ field: 'supplierCode',
+ title: '供应商编码',
+ visible: true
+ },
+ {
+ field: 'manufactureDate',
+ title: '生产日期',
+ sortable: true,
+ visible: false
+ },
+ {
+ field: 'expirationDate',
+ title: '失效日期',
+ sortable: true,
+ visible: false
+ },
+ {
+ field: 'inventorySts',
+ title: '库存状态',
+ align: 'center',
+ formatter: function (value, row, index) {
+ return $.table.selectDictLabel(inventoryStatus, value);
+ }
+ },
+
+ {
+ field: 'referCode',
+ title: '上游单号'
+ },
+ {
+ field: 'referDetailId',
+ title: '上游单号行号'
+ },
+ {
+ field: 'qcCheck',
+ title: '质检'
+ },
+ {
+ field: 'weight',
+ title: '重量'
+ },
+ {
+ field: 'attributeId',
+ title: '属性号',
+ visible: false
+ },
+ {
+ field: 'attribute1',
+ title: '属性1',
+ visible: false
+ },
+ {
+ field: 'attribute2',
+ title: '属性2',
+ visible: false
+ },
+ {
+ field: 'attribute3',
+ title: '属性3',
+ visible: false
+ },
+ {
+ field: 'lockCode',
+ title: '锁',
+ },
+ {
+ field: 'lastCycleCountDate',
+ title: '上次盘点日期',
+ visible: false,
+ sortable: true
+ },
+ {
+ field: 'created',
+ title: '入库日期',
+ sortable: true
+ },
+ {
+ field: 'createdBy',
+ title: '创建用户',
+ visible: false
+ },
+ {
+ field: 'lastUpdated',
+ title: '最后修改时间',
+ sortable: true
+ },
+ {
+ field: 'lastUpdatedBy',
+ title: '更新用户'
+ },
+ {
+ field: 'userDef1',
+ title: '自定义字段1',
+ visible: false
+ },
+ {
+ field: 'userDef2',
+ title: '自定义字段2',
+ visible: false
+ },
+ {
+ field: 'userDef3',
+ title: '自定义字段3',
+ visible: false
+ }
+ ]
+ };
+ $.table.init(options);
+ });
+
+ function localSubmit(url, type, dataType, data) {
+ $.modal.loading("正在处理中，请稍后...");
+ var config = {
+ url: url, type: type, dataType: dataType, data: data, success: function (result) {
+ if (result.code == web_status.SUCCESS) {
+ $.modal.msgSuccess(result.msg);
+ } else {
+ $.modal.alertError(result.msg)
+ }
+ $.modal.closeLoading()
+ }
+ };
+ $.ajax(config)
+ }
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
index d0e89b6..da09458 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
@@ -140,19 +140,18 @@
},
{
field : 'projectNos',
- title : ' 项目号列表'
+ title : ' 项目号列表',
+ visible: false
},
{
field : 'batchs',
- title : ' 批次列表'
+ title : ' 批次列表',
+ visible: false
},
{
field : 'lots',
- title : ' 批号列表'
- },
- {
- field : 'lastCycleCountDate',
- title : ' 上次盘点日期'
+ title : ' 批号列表',
+ visible: false
},
{
field : 'lock',
@@ -206,9 +205,9 @@
});
function detail(id) {
- let url= ctx + "shipment/shipmentHeader"; //网页地址
+ let url= ctx + "inventory/inventoryDetail"; //明细网页地址
if (id){
- url = ctx +"inventory/inventoryDetail?id="+id;
+ url = ctx +"inventoryDetail/inventoryDetail?id="+id;
}
$("#tabDetail").children().remove();
$("#myTab li").removeClass("active");
@@ -223,31 +222,14 @@
function cyclecountPrint(id) {
var url = prefix + "/report/" + id;
- $.modal.open("差异单打印" , url);
+ $.modal.open("打印" , url);
}
$("#myTab li:eq(1)").click(function () {
detail();
});
- // function upLoad(code,sourceCode) {
- // $.ajax({
- // url:ctx+'/api/icsCyclecount/cycleCountDiff',
- // type:'post',
- // data:{
- // code:code,
- // sourceCode:sourceCode
- // },
- // success:function (res) {
- // if (res.code === 200) {
- // $.modal.msgSuccess();
- // }
- // else {
- // $.modal.msgError(res.msg);
- // }
- // }
- // })
- // }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html b/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html
deleted file mode 100644
index 96508a1..0000000
--- a/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html
+++ /dev/null
@@ -1,308 +0,0 @@
-<!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="white-bg">
-<div class="row">
- <div class="col-sm-12">
- <div class="col-sm-12 select-info">
- <div class="select-list" th:object="${header}">
- <ul>
- <li>
- <form id="cycleHeader-form">
- 差异单ID：<input type="text" id="cyclecountAdjustId" name="cyclecountAdjustId"
- readonly="readonly">
- </form>
- </li>
- <li>
- 货主编码：<input id="companyCode" type="text" name="companyCode" readonly="readonly"/>
- </li>
- <li>
- 调整单编码：<input id="code" type="text" name="code" readonly="readonly"/>
- </li>
- <li>
- 源盘点单号：<input id="sourceCode" type="text" name="sourceCode" readonly="readonly">
- </li>
- <!-- <li>
- <!–头 状 态：<input type="text" name="firstStatus"/>–>
- 状态：<input id = "status" type="text" name="status" th:value="*{statusLabel}" readonly="readonly">
- </li>-->
- <li>
- 调整单状态：<input id="status" type="text" name="status" readonly="readonly">
- </li>
- <li>
- 创建时间：<input id="created" type="text" name="created" readonly="readonly">
-
- </li>
- <li>
- 创建人：<input id="createdBy" type="text" name="createdBy" readonly="readonly">
- </li>
- <li>
- 最后更新时间：<input id="lastUpdated" type="text" name="lastUpdated" readonly="readonly">
-
- </li>
- <li>
- 最后更新人：<input id="lastUpdatedBy" type="text" name="lastUpdatedBy" readonly="readonly">
- </li>
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
- class="fa fa-search"></i> 搜索</a>
- </li>
- </ul>
- </div>
- </div>
- <div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="update()">
- <i class="fa fa-refresh"></i>刷新
- </a>
- </div>
- <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
- </div>
-</div>
-<div th:include="include :: footer"></div>
-<script th:inline="javascript">
- var prefix = ctx + "inventory/inventoryDetail";
- var prefix_head = ctx + "inventory/inventoryHeader";
- var datas = [[${@dict.getType('adjustType')}]];
- var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
-
- var created;
-
-
- $(function () {
- var options = {
- url: prefix + "/inventoryDetailLook",
- /* createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{id}",
- removeUrl: prefix + "/remove",*/
- modalName: "差异单明细",
- sortName: "id",
- sortOrder: "desc",
- showRefresh: false,
- search: false,
- // pagination:false,
- columns: [
- {
- radio: true
- },
- {
- field: 'id',
- title: '明细Id',
- sortable: true
- },
-
- {
- field: '',
- title: '',
- sortable: true,
- visible: false
- },
- {
- field: 'locationCode',
- title: '库位编号',
- },
- {
- field: 'containerCode',
- title: '容器编号',
- },
- {
- field: 'materialCode',
- title: '物料编码',
-
- },
- {
- field: 'materialName',
- title: '物料名称',
-
- },
- {
- field: 'materialSpecification',
- title: '物料规格',
-
- },
- {
- field: 'receiptCode',
- title: '入库单编码'
- },
- {
- field: 'receiptId',
- title: '入库单id',
- sortable: true,
- visible: false
- },
- {
- field: 'receiptDetailId',
- title: '入库单明细id',
- sortable: true,
- visible: false
- },
- {
- field: 'qty',
- title: '数量'
- },
- {
- field: 'batch',
- title: '批次',
- sortable: true,
- sortable: true
- },
- {
- field: 'lot',
- title: '批号',
- sortable: true,
- sortable: true
- },
- {
- field: 'project',
- title: '项目号',
- sortable: true,
- sortable: true
- },
- {
- field: 'manufactureDate',
- title: '生产日期',
- sortable: true,
- visible: false
-
- },
- {
- field: 'expirationDate',
- title: '失效日期',
- sortable: true,
- visible: false
- },
- {
- field: 'inventoryStatus',
- title: '库存状态',
- formatter: function (value, row, index) {
- return $.table.selectDictLabel(inventoryStatus, value);
- },
- sortable: true
- },
-
- {
- field: 'created',
- title: '创建时间',
- sortable: true
- },
- {
- field: 'createdBy',
- title: '创建用户'
- },
- {
- field: 'lastUpdated',
- title: '更新时间',
- sortable: true
- },
- {
- field: 'lastUpdatedBy',
- title: '更新用户'
- },
- {
- field: 'fromSource',
- title: '物料来源'
- },
- {
- field: 'status',
- title: '明细状态',
- formatter: function (value, row, index) {
- return $.table.selectDictLabel(datas, value);
- },
- sortable: true
- },
- ]
- };
- $.table.init(options);
- update();
- });
-
- function update() {
- var url = location.search; //获取url中"?"符后的字串
- if (url.indexOf("?") != -1) { //判断是否有参数
- var str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
- strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
- $.ajax({
- url: prefix + "/list",//
- type: "post",
- data: {
- id: strs[1]
- },
- success: function (res) {
- $("#bootstrap-table").bootstrapTable('removeAll');
- // $("#bootstrap-table").bootstrapTable('append', res.data);
- for (var i = 0; i < res.data.length; i++) {
- $("#bootstrap-table").bootstrapTable('insertRow', {index: i, row: res.data[i]});
-
- }
- }
- })
- }
- else{
- $.ajax({
- url:ctx+"",
- type:"post",
- data:{},
- success:function (res) {
- $("#bootstrap-table").bootstrapTable('load',res.data)
- }
- })
- }
-
- // $.ajax({
- // url:prefix_head+ "/getHeader",
- // type:"post",
- // data:{
- // id:$('#cyclecountAdjustId').val()
- // },
- // success:function (value) {
- // if (value.data) {
- // $('#code').val(value.data.code);
- // // $('#type').val(value.data.typeLabel);
- // $('#status').val(value.data.statusLabel);
- // $('#created').val(value.data.created);
- // var text_val=$('#created').val();
- // $('#created').val(text_val.replace("T"," "));
- // //$('#createdBy').val(value.data.createdBy);
- // $('#lastUpdated').val(value.data.lastUpdated);
- // var text_val_t=$('#lastUpdated').val();
- // $('#lastUpdated').val(text_val_t.replace("T"," "));
- // //$('#lastUpdatedBy').val(value.data.lastUpdatedBy);
- // }
- // }
- // })
- }
-
- function open(title, url, width, height) {
- if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {
- width = 'auto';
- height = 'auto';
- }
- if (title == null) {
- title = false;
- }
- if (url == null) {
- url = "404.html";
- }
- if ($.common.isEmpty(width)) {
- width = 800;
- // width = ($(window).width() - 100);
- }
- if ($.common.isEmpty(height)) {
- height = ($(window).height() - 50);
- }
- layer.open({
- type: 2,
- area: [width + 'px', height + 'px'],
- fix: false,
- //不固定
- maxmin: true,
- shade: 0.3,
- title: title,
- content: url
- // shadeClose: true, //点击遮罩关闭层
- })
- }
-
-</script>
-</body>
-</html>
\ No newline at end of file