pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

为出库查询页面添加颜色提醒并修改出库申请查询页面

lwx_dev
erdanergou 3 years ago
parent
e42a6b6b21
commit
32a1f65518
17 changed files with 103 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
  3. 4
      src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
  4. 9
      src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java
  5. 31
      src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
  6. 7
      src/main/resources/static/lib/layui-v2.8.6/layui.js
  7. 38
      src/main/resources/templates/pages/application/my-task.html
  8. 2
      src/main/resources/templates/pages/depository/table-in.html
  9. 14
      src/main/resources/templates/pages/depository/table-stock.html
  10. 27
      src/main/resources/templates/pages/material/material-out.html
  11. 1
      src/main/resources/templates/pages/material/material-view_back.html
  12. 8
      target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  13. 4
      target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
  14. 38
      target/classes/templates/pages/application/my-task.html
  15. 2
      target/classes/templates/pages/depository/table-in.html
  16. 14
      target/classes/templates/pages/depository/table-stock.html
  17. 27
      target/classes/templates/pages/material/material-out.html

1
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -1766,7 +1766,6 @@ public class MaterialController {
*/
@PostMapping("/getNewTreeForMtId")
public RestResponse getNewTreeForMtId(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String mname = (String) map.get("mname");
String type = (String) map.get("type");
String token = request.getHeader("user-token");
if (token == null) {

4
src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java
View File

@ -303,7 +303,7 @@ public interface MaterialMapper {
* @param map
* @return
*/
List<Inventory> findMaterialByDepositorysAndType(Map<String, Object> map);
List<Inventory> findInventoryByDepositorysAndType(Map<String, Object> map);
/**
@ -312,7 +312,7 @@ public interface MaterialMapper {
* @param map
* @return
*/
List<Inventory> findMaterialByDepository(Map<String, Object> map);
List<Inventory> findInventoryByDepository(Map<String, Object> map);
/**
* 根据仓库查询物品数目

4
src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
View File

@ -656,7 +656,7 @@
and state = 1;
</select>
<select id="findMaterialByDepositorysAndType" resultMap="InventoryMap" parameterType="map">
<select id="findInventoryByDepositorysAndType" resultMap="InventoryMap" parameterType="map">
SELECT
<include refid="allColumnsAndTypeNameOnViewByInventory"/>
from findInventory
@ -780,7 +780,7 @@
<!-- 根据仓库查询物料-->
<select id="findMaterialByDepository" resultMap="InventoryMap" parameterType="map">
<select id="findInventoryByDepository" resultMap="InventoryMap" parameterType="map">
SELECT
<include refid="allColumnsAndTypeNameOnViewByInventory"/>
from findInventory

9
src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java
View File

@ -1,6 +1,7 @@
package com.dreamchaser.depository_manage.pojo;
import com.dreamchaser.depository_manage.entity.*;
import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import lombok.Data;
import java.util.List;
@ -189,7 +190,7 @@ public class InventoryP {
/**
* 暂存额度
*/
private Integer numberOfTemporary;
private Double numberOfTemporary;
/**
@ -241,10 +242,10 @@ public class InventoryP {
this.id = inventory.getId(); // 编号
this.mid = inventory.getMid(); // 编号
this.mname = inventory.getMname(); // 物料名称
this.quantity = (double) inventory.getQuantity() / 100; // 数量
this.quantity = ObjectFormatUtil.divide(inventory.getQuantity(),100.0,2); // 数量
this.price = inventory.getPrice(); // 单价
this.state = inventory.getState(); // 物料状态
this.amounts = inventory.getAmounts() / 100; // 总额
this.amounts = ObjectFormatUtil.divide(inventory.getAmounts(),100.0,2); // 总额
this.unit = inventory.getUnit() == null ? "" : inventory.getUnit(); // 计量单位
this.texture = inventory.getTexture() == null ? "" : inventory.getTexture(); // 材质
this.code = inventory.getCode(); // 存货编码
@ -256,7 +257,7 @@ public class InventoryP {
this.brand = inventory.getBrand() == null ? "" : inventory.getBrand(); // 品牌
this.remark = inventory.getRemark(); // 备注
this.shelfLifeForCalc = inventory.getShelfLife(); //保质期，用于计算
this.numberOfTemporary = inventory.getNumberOfTemporary(); // 临时数量（出库数量）
this.numberOfTemporary = ObjectFormatUtil.divide(inventory.getNumberOfTemporary(),100.0,2); // 临时数量（出库数量）
this.baseUnit = inventory.getUnit(); // 基础单位
this.placeKingdeeCode = inventory.getPlaceKingdeeCode(); // 库位编码（金蝶）
this.depositoryName = inventory.getDepositoryName(); // 仓库名称

31
src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
View File

@ -16,7 +16,6 @@ import com.dreamchaser.depository_manage.utils.DateUtil;
import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -505,7 +504,7 @@ public class MaterialServiceImpl implements MaterialService {
* @return
*/
@Override
public List<Inventory> findInventoryByMidAndDidList(Map<String,Object> map){
public List<Inventory> findInventoryByMidAndDidList(Map<String, Object> map) {
Integer size = 10, page = 1;
if (map.containsKey("size")) {
size = ObjectFormatUtil.toInteger(map.get("size"));
@ -528,7 +527,6 @@ public class MaterialServiceImpl implements MaterialService {
}
/**
* 根据物料id与仓库id列表获取对应库存数量
*
@ -1030,7 +1028,7 @@ public class MaterialServiceImpl implements MaterialService {
}
Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId);
List<Inventory> materialByDepository = materialMapper.findMaterialByDepository(map);
List<Inventory> materialByDepository = materialMapper.findInventoryByDepository(map);
for (Inventory inventory : materialByDepository) {
inventory.setDepositoryCode(depositoryRecordById.getCode());
// 获取当前物料所处库位
@ -1414,7 +1412,6 @@ public class MaterialServiceImpl implements MaterialService {
jsonObject.put("spread", true);
stringObjectMap.put("spread", true);
result.add(stringObjectMap);
continue;
} else {
List<Object> childList = (List<Object>) jsonObject.get("children");
List<Object> objectList1 = rewriteTree(childList, stringObjectMap, mtLevel - 1, mt, 1);
@ -2068,7 +2065,7 @@ public class MaterialServiceImpl implements MaterialService {
if (mt != null) {
Map<String, Object> param = new HashMap<>();
param.put("materialTypeId", mt.getOldId());
List<Inventory> materialPByCondition = new ArrayList<>();
List<Inventory> inventoryByDepositorys = new ArrayList<>();
List<Material> materialByDepositorys = new ArrayList<>();
int flag = 0;
if ("".equals(adminorg)) {
@ -2085,7 +2082,7 @@ public class MaterialServiceImpl implements MaterialService {
dids.add(depository.getId());
}
param.put("list", dids);
materialPByCondition = materialMapper.findMaterialByDepositorysAndType(param);
inventoryByDepositorys = materialMapper.findInventoryByDepositorysAndType(param);
flag = 2;
}
List<Object> result = new ArrayList<>();
@ -2102,7 +2099,7 @@ public class MaterialServiceImpl implements MaterialService {
if (material.getDepositoryId() != null) {
// 如果当前是库存
title += ",当前库存为：" + material.getUnit() + ":" + material.getQuantity();
title += ",当前可用库存为：" + material.getUnit() + ":" + material.getQuantity();
}
map.put("title", title);
@ -2120,7 +2117,7 @@ public class MaterialServiceImpl implements MaterialService {
String title = material.getMname() + ",规格型号： " + version;
if (material.getDepositoryId() != null) {
// 如果当前是库存
title += ",当前库存为：" + material.getUnit() + ":" + material.getQuantity();
title += ",当前可用库存为：" + material.getUnit() + ":" + material.getQuantity();
}
map.put("title", title);
map.put("id", material.getId());
@ -2130,7 +2127,7 @@ public class MaterialServiceImpl implements MaterialService {
}
} else {
if ("".equals(mname)) { // 如果没有输入名称
for (Inventory inventory : materialPByCondition) {
for (Inventory inventory : inventoryByDepositorys) {
Map<String, Object> map = new HashMap<>();
String version = inventory.getVersion();
if (version == null) {
@ -2141,7 +2138,7 @@ public class MaterialServiceImpl implements MaterialService {
// 如果当前是库存
// 获取对应拆单库存处理记录
title.append(",当前库存为：").append(inventory.getUnit()).append(":").append(inventory.getQuantity());
title.append(",当前可用库存为：").append(inventory.getUnit()).append(":").append(ObjectFormatUtil.divide(ObjectFormatUtil.subtract(inventory.getQuantity(),inventory.getNumberOfTemporary()), 100.0, 2));
List<SplitInventory> splitInventoryList = splitUnitMapper.findSplitInventoryByIid(inventory.getId());
if (splitInventoryList.size() > 0) {
// 如果存在
@ -2149,7 +2146,7 @@ public class MaterialServiceImpl implements MaterialService {
// 获取对应的拆单记录
for (SplitInventory splitInventory : splitInventoryList) {
SplitInfo splitInfoById = splitUnitMapper.findSplitInfoById(splitInventory.getSid());
title.append(",").append(splitInventory.getSaveQuantity()).append(splitInfoById.getNewUnit());
title.append(",").append(ObjectFormatUtil.divide(splitInventory.getSaveQuantity(), 100.0, 2)).append(splitInfoById.getNewUnit());
}
}
}
@ -2158,7 +2155,7 @@ public class MaterialServiceImpl implements MaterialService {
result.add(map);
}
} else {
for (Inventory inventory : materialPByCondition) {
for (Inventory inventory : inventoryByDepositorys) {
Map<String, Object> map = new HashMap<>();
if (inventory.getMname().contains(mname)) {
String version = inventory.getVersion();
@ -2171,7 +2168,7 @@ public class MaterialServiceImpl implements MaterialService {
// 如果当前是库存
// 获取对应拆单库存处理记录
title.append(",当前库存为：").append(inventory.getUnit()).append(":").append(inventory.getQuantity());
title.append(",当前可用库存为：").append(inventory.getUnit()).append(":").append(ObjectFormatUtil.divide(ObjectFormatUtil.subtract(inventory.getQuantity(),inventory.getNumberOfTemporary()), 100.0, 2));
List<SplitInventory> splitInventoryList = splitUnitMapper.findSplitInventoryByIid(inventory.getId());
if (splitInventoryList.size() > 0) {
// 如果存在
@ -2182,7 +2179,7 @@ public class MaterialServiceImpl implements MaterialService {
SplitInfo splitInfoById = splitUnitMapper.findSplitInfoById(splitInventory.getSid());
title.append(",").append(splitInventory.getSaveQuantity()).append(splitInfoById.getNewUnit());
title.append(",").append(ObjectFormatUtil.divide(splitInventory.getSaveQuantity(), 100.0, 2)).append(splitInfoById.getNewUnit());
}
}
}
@ -2212,7 +2209,7 @@ public class MaterialServiceImpl implements MaterialService {
dids.add(ObjectFormatUtil.toInteger(depositoryId));
param.put("list", dids);
// 获取当前类别下的物料
List<Inventory> materialByDepositorysAndType = materialMapper.findMaterialByDepositorysAndType(param);
List<Inventory> materialByDepositorysAndType = materialMapper.findInventoryByDepositorysAndType(param);
for (int i = 0; i < materialByDepositorysAndType.size(); i++) {
Inventory material = materialByDepositorysAndType.get(i);
Map<String, Object> map = new HashMap<>();
@ -2229,7 +2226,7 @@ public class MaterialServiceImpl implements MaterialService {
// 获取当前仓库下的所有物料库存
dids.add(placeById.getDid());
param.put("list", dids);
List<Inventory> materialByDepositorysAndType = materialMapper.findMaterialByDepositorysAndType(param);
List<Inventory> materialByDepositorysAndType = materialMapper.findInventoryByDepositorysAndType(param);
for (int i = 0; i < materialByDepositorysAndType.size(); i++) {
Inventory material = materialByDepositorysAndType.get(i);
Map<String, Object> map = new HashMap<>();

7
src/main/resources/static/lib/layui-v2.8.6/layui.js
View File

@ -449,7 +449,9 @@ layui.define(function (e) {
count: '<span class="layui-laypage-count">\u5171 ' + n.count + " \u6761</span>",
limit: (t = ['<span class="layui-laypage-limits"><select lay-ignore>'], layui.each(n.limits, function (e, a) {
t.push('<option value="' + a + '"' + (a === n.limit ? "selected" : "") + ">" + a + " \u6761/\u9875</option>")
}), t.join("") + "</select></span>"),
}),
t.push('<option value="all">全部数据</option>'),
t.join("") + "</select></span>"),
refresh: ['<a data-page="' + n.curr + '" class="layui-laypage-refresh">', '<i class="layui-icon layui-icon-refresh"></i>', "</a>"].join(""),
skip: ['<span class="layui-laypage-skip">&#x5230;&#x7B2C;', '<input type="text" min="1" value="' + n.curr + '" class="layui-input">', '&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>', "</span>"].join("")
};
@ -470,6 +472,9 @@ layui.define(function (e) {
});
e && o.on(e, "change", function () {
var e = this.value;
if (e === "all") {
e = i.count
}
i.curr * e > i.count && (i.curr = Math.ceil(i.count / e)), i.limit = e, t.render()
}), r && o.on(r, "click", function () {
l()

38
src/main/resources/templates/pages/application/my-task.html
View File

@ -356,21 +356,29 @@
};
// 用于跳转到出库任务查看页面
openDetailForOutView = function (item) {
var index = layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/ApplicationOutView?id=' + item,
end: function () {
location.reload()
}
});
$(window).on("resize", function () {
layer.full(index);
});
if(isMobile()){
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/ApplicationOutView?id=' + item
});
}else{
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
area: ['30%', '100%'],
content: '/ApplicationOutView?id=' + item
});
}
};
// 用于跳转到入库任务查看页面
openDetailForInView = function (item) {

2
src/main/resources/templates/pages/depository/table-in.html
View File

@ -86,7 +86,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 新建</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
th:style="'display:'+${display}"> 删除
</button>

14
src/main/resources/templates/pages/depository/table-stock.html
View File

@ -82,8 +82,8 @@
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add">添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="dispose">处理</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add">批量添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="dispose">批量处理</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" id="u_fileUpload"
lay-event="import">导入数据
</button>
@ -219,7 +219,8 @@
{field: 'version', width: 200, title: '规格型号'},
{field: 'typeName', width: 200, title: '物料类型', hide: true},
{field: "unit", title: '计量单位', width: 100, templet: '#changeUnit', align: "center"},
{field: 'quantity', width: 100, title: '数量'},
{field: 'quantity', width: 100, title: '库存总数'},
{field: 'numberOfTemporary', width: 100, title: '申请总数'},
{field: 'depositoryName', width: 200, title: '仓库名称'},
{field: 'depositoryCode', width: 200, title: '仓库编码', hide: true},
// {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
@ -267,8 +268,9 @@
{field: 'version', width: 200, title: '规格型号'},
{field: 'typeName', width: 200, title: '物料类型', hide: true},
{field: "unit", title: '计量单位', width: 100, templet: '#changeUnit', align: "center"},
{field: 'quantity', width: 100, title: '数量'},
{field: 'depositoryName', width: 200, title: '仓库名称'},
{field: 'quantity', width: 100, title: '库存总数'},
{field: 'numberOfTemporary', width: 100, title: '申请总数'},
{field: 'depositoryName', width: 150, title: '仓库名称'},
{field: 'depositoryCode', width: 200, title: '仓库编码', hide: true},
// {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
{field: "placeKingdeeCode", title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
@ -304,7 +306,7 @@
}
// 所处库位
var placeCodeItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[10];
var placeCodeItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[11];
//计量单位
// 用于库位的添加
var aItem = placeCodeItem.childNodes[0];

27
src/main/resources/templates/pages/material/material-out.html
View File

@ -117,7 +117,6 @@
<a id="{{d.id}}" onclick="showDetail(this)">{{d.code}}</a>
</script>
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
@ -643,31 +642,7 @@
table.on('tool(currentTableFilter)', function (obj) {
let data = obj.data;
if (obj.event === 'detail') {
var index = layer.open({
title: '物料信息详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/material_view?id=' + data.id,
end: function () {
//执行搜索重载
table.reloadData('currentTableId', {
url: '/material/material',
page: {
curr: 1
}
}, 'data');
}
});
$(window).on("resize", function () {
layer.full(index);
});
return false;
} else if (obj.event === 'delete') {
if (obj.event === 'delete') {
var req = {};
req.id = data.id;
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {

1
src/main/resources/templates/pages/material/material-view_back.html
View File

@ -387,7 +387,6 @@
{type: "checkbox", width: 50},
{field: 'depositoryName', width: 150, title: '仓库名称'},
{field: 'quantity', width: 100, title: '数量', sort: true},
{field: 'state', width: 140, title: '流程状态'},
{
field: 'pass', title: '完成出库', width: 100, templet: function (d) {
if (d.pass === 1) {

8
target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
View File

@ -638,8 +638,12 @@
and constructionunitid = #{constructionunitid}
</if>
GROUP BY aorid
ORDER BY applicantTime desc
<if test="groupByForState != null and groupByForState !=''">
ORDER BY pass DESC, applicantTime desc
</if>
<if test="groupByForState == null or groupByForState == ''">
ORDER BY applicantTime desc
</if>
<if test="begin != null and size != null">
LIMIT #{begin},#{size}
</if>

4
target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
View File

@ -656,7 +656,7 @@
and state = 1;
</select>
<select id="findMaterialByDepositorysAndType" resultMap="InventoryMap" parameterType="map">
<select id="findInventoryByDepositorysAndType" resultMap="InventoryMap" parameterType="map">
SELECT
<include refid="allColumnsAndTypeNameOnViewByInventory"/>
from findInventory
@ -780,7 +780,7 @@
<!-- 根据仓库查询物料-->
<select id="findMaterialByDepository" resultMap="InventoryMap" parameterType="map">
<select id="findInventoryByDepository" resultMap="InventoryMap" parameterType="map">
SELECT
<include refid="allColumnsAndTypeNameOnViewByInventory"/>
from findInventory

38
target/classes/templates/pages/application/my-task.html
View File

@ -356,21 +356,29 @@
};
// 用于跳转到出库任务查看页面
openDetailForOutView = function (item) {
var index = layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/ApplicationOutView?id=' + item,
end: function () {
location.reload()
}
});
$(window).on("resize", function () {
layer.full(index);
});
if(isMobile()){
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/ApplicationOutView?id=' + item
});
}else{
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
area: ['30%', '100%'],
content: '/ApplicationOutView?id=' + item
});
}
};
// 用于跳转到入库任务查看页面
openDetailForInView = function (item) {

2
target/classes/templates/pages/depository/table-in.html
View File

@ -86,7 +86,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 新建</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
th:style="'display:'+${display}"> 删除
</button>

14
target/classes/templates/pages/depository/table-stock.html
View File

@ -82,8 +82,8 @@
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add">添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="dispose">处理</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add">批量添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="dispose">批量处理</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" id="u_fileUpload"
lay-event="import">导入数据
</button>
@ -219,7 +219,8 @@
{field: 'version', width: 200, title: '规格型号'},
{field: 'typeName', width: 200, title: '物料类型', hide: true},
{field: "unit", title: '计量单位', width: 100, templet: '#changeUnit', align: "center"},
{field: 'quantity', width: 100, title: '数量'},
{field: 'quantity', width: 100, title: '库存总数'},
{field: 'numberOfTemporary', width: 100, title: '申请总数'},
{field: 'depositoryName', width: 200, title: '仓库名称'},
{field: 'depositoryCode', width: 200, title: '仓库编码', hide: true},
// {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
@ -267,8 +268,9 @@
{field: 'version', width: 200, title: '规格型号'},
{field: 'typeName', width: 200, title: '物料类型', hide: true},
{field: "unit", title: '计量单位', width: 100, templet: '#changeUnit', align: "center"},
{field: 'quantity', width: 100, title: '数量'},
{field: 'depositoryName', width: 200, title: '仓库名称'},
{field: 'quantity', width: 100, title: '库存总数'},
{field: 'numberOfTemporary', width: 100, title: '申请总数'},
{field: 'depositoryName', width: 150, title: '仓库名称'},
{field: 'depositoryCode', width: 200, title: '仓库编码', hide: true},
// {title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
{field: "placeKingdeeCode", title: '所处库位', width: 200, templet: '#changePlace', align: "center"},
@ -304,7 +306,7 @@
}
// 所处库位
var placeCodeItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[10];
var placeCodeItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[11];
//计量单位
// 用于库位的添加
var aItem = placeCodeItem.childNodes[0];

27
target/classes/templates/pages/material/material-out.html
View File

@ -117,7 +117,6 @@
<a id="{{d.id}}" onclick="showDetail(this)">{{d.code}}</a>
</script>
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
@ -643,31 +642,7 @@
table.on('tool(currentTableFilter)', function (obj) {
let data = obj.data;
if (obj.event === 'detail') {
var index = layer.open({
title: '物料信息详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/material_view?id=' + data.id,
end: function () {
//执行搜索重载
table.reloadData('currentTableId', {
url: '/material/material',
page: {
curr: 1
}
}, 'data');
}
});
$(window).on("resize", function () {
layer.full(index);
});
return false;
} else if (obj.event === 'delete') {
if (obj.event === 'delete') {
var req = {};
req.id = data.id;
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {

Write Preview
Loading…
Cancel
Save