feat: 新增根据商品id查询明细的功能

b856ee44 · Skyeye云 · 8a12f16e · b856ee44 · b856ee44 · b856ee44
5 changed file
--- a/erp/src/main/resources/template/js/materialCode/materialCodeReportList.js
+++ b/erp/src/main/resources/template/js/materialCode/materialCodeReportList.js
+
+layui.config({
+	base: basePath,
+	version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+	winui.renderColor();
+	var $ = layui.$,
+		form = layui.form,
+		table = layui.table;
+
+	var materialId = getNotUndefinedVal(GetUrlParam("materialId"));
+	var normsId = getNotUndefinedVal(GetUrlParam("normsId"));
+	var depotId = getNotUndefinedVal(GetUrlParam("depotId"));
+	var objectId = getNotUndefinedVal(GetUrlParam("objectId"));
+
+	// 产品规格明细列表
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+		url: sysMainMation.erpBasePath + 'queryMaterialNormsCodeList',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+			{ field: 'name', title: '商品名称', align: 'left', width: 150, templet: function (d) {
+				return getNotUndefinedVal(d.materialMation?.name);
+			}},
+			{ field: 'model', title: '型号', align: 'left', width: 150, templet: function (d) {
+				return getNotUndefinedVal(d.materialMation?.name);
+			}},
+			{ field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {
+				return getNotUndefinedVal(d.normsMation?.name);
+			}},
+			{ field: 'depotMation', title: '所在仓库', align: 'left', width: 200, templet: function (d) {
+				return getNotUndefinedVal(d.depotMation?.name);
+			}},
+			{ field: 'categoryId', title: '所属分类', align: 'center', width: 100, templet: function (d) {
+				return sysDictDataUtil.getDictDataNameByCodeAndKey("ERP_MATERIAL_CATEGORY", getNotUndefinedVal(d.materialMation?.categoryId));
+			}},
+			{ field: 'barCodeMation', title: '条形码', align: 'center', width: 150, templet: function (d) {
+				return '<img src="' + systemCommonUtil.getFilePath(d.barCodeMation.imagePath) + '" class="photo-img" lay-event="barCode" style="width: 100px">';
+			}},
+			{ field: 'inDepot', title: '状态', align: 'center', width: 100, templet: function(d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialNormsCodeInDepot", 'id', d.inDepot, 'name');
+			}},
+			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+			{ field: 'qualityWarehousingTime', title: "质检入库时间", align: 'center', width: 150 },
+		]],
+		done: function(json) {
+			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入资产编号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+		}
+	});
+
+	table.on('tool(messageTable)', function (obj) {
+		var data = obj.data;
+		var layEvent = obj.event;
+		if (layEvent === 'barCode') { // 条形码预览
+			systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.barCodeMation.imagePath));
+		}
+    });
+
+	form.render();
+    $("body").on("click", "#reloadTable", function() {
+    	loadassetTable();
+    });
+
+    function loadassetTable() {
+    	table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+		let params = {
+			materialId: materialId,
+			normsId: normsId,
+			depotId: depotId,
+			objectId: objectId
+		}
+		return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('materialCodeReportList', {});
+});
--- a/erp/src/main/resources/template/tpl/materialCode/materialCodeReportList.html
+++ b/erp/src/main/resources/template/tpl/materialCode/materialCodeReportList.html
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-toolbar">
+		<div class="winui-tool">
+			<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+		</div>
+	</div>
+	<div style="margin: auto 10px;">
+		<table id="messageTable" lay-filter="messageTable"></table>
+	</div>
+
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/materialCode/'}).use('materialCodeReportList');
+    </script>
+</body>
+</html>
\ No newline at end of file
--- a/web/src/main/resources/bootstrap.yml
+++ b/web/src/main/resources/bootstrap.yml
@@ -10,9 +10,9 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 172.18.92.40:9000 # 配置服务注册nacos地址
+        server-addr: localhost:9000 # 配置服务注册nacos地址
      config:
        # 指定nacos server的地址
-        server-addr: 172.18.92.40:9000
+        server-addr: localhost:9000
        file-extension: yml
        namespace: dev
\ No newline at end of file
--- a/web/src/main/resources/template/assets/lib/layui/lay/modules/ruleCode/ruleCode.js
+++ b/web/src/main/resources/template/assets/lib/layui/lay/modules/ruleCode/ruleCode.js
@@ -17,8 +17,8 @@ layui.define(["jquery", "dragula", 'winui', 'form', 'element'], function(exports
    }, {
        text: "日期",
        code: "code_manage_date",
-        html: '<select class="layui-input code_manage_date" lay-filter="code_manage_date"><option value="yyyy" data-lang="code_manage_y">年</option><option value="yyyyMM" data-lang="code_manage_y_m">年月</option><option value="yyyyMMdd" data-lang="code_manage_y_m_d">年月日</option><option value="yyyyMMddhh" data-lang="code_manage_y_m_d_h">年月日时</option></select>',
-        helper: '<p data-lang="code_manage_y" class="ellipsis">年</p><p> yyyy</p><p data-lang="code_manage_y_m" class="ellipsis">年月</p><p> yyyyMM</p><p data-lang="code_manage_y_m_d" class="ellipsis">年月日</p><p> yyyyMMdd</p><p data-lang="code_manage_y_m_d_h" class="ellipsis">年月日时</p><p> yyyyMMddhh</p>',
+        html: '<select class="layui-input code_manage_date" lay-filter="code_manage_date"><option value="yyyy" data-lang="code_manage_y">年</option><option value="yyyyMM" data-lang="code_manage_y_m">年月</option><option value="yyyyMMdd" data-lang="code_manage_y_m_d">年月日</option><option value="yyyyMMddHH" data-lang="code_manage_y_m_d_h">年月日时</option></select>',
+        helper: '<p data-lang="code_manage_y" class="ellipsis">年</p><p> yyyy</p><p data-lang="code_manage_y_m" class="ellipsis">年月</p><p> yyyyMM</p><p data-lang="code_manage_y_m_d" class="ellipsis">年月日</p><p> yyyyMMdd</p><p data-lang="code_manage_y_m_d_h" class="ellipsis">年月日时</p><p> yyyyMMddHH</p>',
        bgColor: "#FFBB96",
        eg: function(value) {
            return new Date().format(value);

--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/web/src/main/resources/template/json/skyeyeClassEnum.json
@@ -51,6 +51,7 @@
    "machinStateEnum": {"name": "加工单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinStateEnum"},
    "machinPickStateEnum": {"name": "加工单领料状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"},
    "machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"},
+    "materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"},

    "skyeyeView": {"name": "视图类型", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"},
    "widthScale": {"name": "宽度比例", "className": "skyeye-pro#com.skyeye.attr.classenum.WidthScale"},