feat: ERP仓库代码修改

erp/src/main/resources/template/js/depotOut/list.js

@@ -9,16 +9,14 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         table = layui.table;
-    var serviceClassName = sysServiceMation["putIsPurchase"]["key"];
+    var serviceClassName = sysServiceMation["depotOutOrder"]["key"];
     authBtn('1719559094857');//新增
 
-    // 加载列表数据权限
-    loadAuthBtnGroup('messageTable', '1719558882479');
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: sysMainMation.erpBasePath + 'queryDepotOutList',
+        url: sysMainMation.erpBasePath + 'queryDepotOutOrderList',
         where: getTableParams(),
         even: true,
         page: true,

erp/src/main/resources/template/js/depotOut/transList.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;
+
+    // 单据类型枚举类
+    let idKeyMap = {}
+    let enumResult = skyeyeClassEnumUtil.getEnumDataListByClassName("depotOutFromType");
+    $.each(enumResult.rows, function (i, item) {
+        idKeyMap[item.idKey] = item.name
+    });
+
+    // 加载列表数据权限
+    loadAuthBtnGroup('messageTable', '1719566072891');
+    initTable();
+    function initTable() {
+        table.render({
+            id: 'messageTable',
+            elem: '#messageTable',
+            method: 'post',
+            url: sysMainMation.erpBasePath + 'queryDepotOutList',
+            where: getTableParams(),
+            even: true,
+            page: true,
+            limits: getLimits(),
+            limit: getLimit(),
+            cols: [[
+                { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+                { field: 'oddNumber', title: '单据单号', align: 'left', width: 220, templet: function (d) {
+                    var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+                    if (!isNull(d.fromId)) {
+                        str += '<span class="state-new">[转]</span>';
+                    }
+                    return str;
+                }},
+                { field: 'idKey', title: '单据类型', width: 120, templet: function (d) {
+                    return idKeyMap[d.idKey];
+                }},
+                { field: 'createName', title: '申请人', width: 120 },
+                { field: 'createTime', title: '申请时间', align: 'center', width: 150 },
+                { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
+                { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
+                { field: 'otherState', title: '出库状态', width: 90, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name');
+                }},
+                { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}
+            ]],
+            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 === 'details') { //详情
+                details(data);
+            } else if (layEvent === 'depotOut') { //出库
+                depotOut(data);
+            }
+        });
+    }
+
+    // 详情
+    function details(data) {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024062800003&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "purchasePutDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('depotOutTransList', {});
+});

erp/src/main/resources/template/js/depotPut/transList.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;
+
+    // 单据类型枚举类
+    let idKeyMap = {}
+    let enumResult = skyeyeClassEnumUtil.getEnumDataListByClassName("depotPutFromType");
+    $.each(enumResult.rows, function (i, item) {
+        idKeyMap[item.idKey] = item.name
+    });
+
+    // 加载列表数据权限
+    loadAuthBtnGroup('messageTable', '1719565477053');
+    initTable();
+    function initTable() {
+        table.render({
+            id: 'messageTable',
+            elem: '#messageTable',
+            method: 'post',
+            url: sysMainMation.erpBasePath + 'queryDepotPutList',
+            where: getTableParams(),
+            even: true,
+            page: true,
+            limits: getLimits(),
+            limit: getLimit(),
+            cols: [[
+                { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+                { field: 'oddNumber', title: '单据单号', align: 'left', width: 220, templet: function (d) {
+                    var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+                    if (!isNull(d.fromId)) {
+                        str += '<span class="state-new">[转]</span>';
+                    }
+                    return str;
+                }},
+                { field: 'idKey', title: '单据类型', width: 120, templet: function (d) {
+                    return idKeyMap[d.idKey];
+                }},
+                { field: 'createName', title: '申请人', width: 120 },
+                { field: 'createTime', title: '申请时间', align: 'center', width: 150 },
+                { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
+                { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
+                { field: 'otherState', title: '入库状态', width: 90, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name');
+                }},
+                { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}
+            ]],
+            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 === 'details') { //详情
+                details(data);
+            } else if (layEvent === 'depotPut') { //入库
+                depotPut(data);
+            }
+        });
+    }
+
+    // 详情
+    function details(data) {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024062800003&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "purchasePutDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('depotPutTransList', {});
+});

erp/src/main/resources/template/js/purchasePut/purchasePutList.js

@@ -43,6 +43,9 @@ layui.config({
             { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
             }},
+            { field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name');
+            }},
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
             { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },

erp/src/main/resources/template/tpl/depotOut/transList.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>
+		<script type="text/html" id="tableBar">
+			{{# if(d.otherState == 2 || d.otherState == 3) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="depotOut">出库</a>
+			{{# } }}
+		</script>
+	</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/depotOut/'}).use('transList');
+	</script>
+</body>
+</html>
\ No newline at end of file

erp/src/main/resources/template/tpl/depotPut/transList.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>
+		<script type="text/html" id="tableBar">
+			{{# if(d.otherState == 2 || d.otherState == 3) { }}
+				<a class="layui-btn layui-btn-xs" lay-event="depotPut">入库</a>
+			{{# } }}
+		</script>
+	</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/depotPut/'}).use('transList');
+	</script>
+</body>
+</html>
\ No newline at end of file

web/src/main/resources/template/json/skyeyeClassEnum.json

@@ -79,7 +79,9 @@
     "machinFromType": {"name": "加工单来源单据类型", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinFromType"},
     "wholeOrderOutFromType": {"name": "整单委外单来源单据类型", "className": "skyeye-erp#com.skyeye.whole.classenum.WholeOrderOutFromType"},
     "depotOutFromType": {"name": "仓库出库单来源单据类型", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotOutFromType"},
+    "depotOutState": {"name": "仓库出库单出库状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotOutState"},
     "depotPutFromType": {"name": "仓库入库单来源单据类型", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotPutFromType"},
+    "depotPutState": {"name": "仓库入库单入库状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotPutState"},
 
     "skyeyeView": {"name": "视图类型", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"},
     "widthScale": {"name": "宽度比例", "className": "skyeye-pro#com.skyeye.attr.classenum.WidthScale"},

web/src/main/resources/template/json/sysServiceMation.json

@@ -15,6 +15,8 @@
     "splitListOrder": {"name": "拆分订单", "key": "com.skyeye.other.service.impl.SplitListServiceImpl"},
     "assemblySheetOrder": {"name": "组装订单", "key": "com.skyeye.other.service.impl.AssemblySheetServiceImpl"},
     "allocationFormOrder": {"name": "调拨订单", "key": "com.skyeye.other.service.impl.AllocationServiceImpl"},
+    "depotOutOrder": {"name": "仓库出库单", "key": "com.skyeye.depot.service.impl.DepotOutServiceImpl"},
+    "depotPutOrder": {"name": "仓库入库单", "key": "com.skyeye.depot.service.impl.DepotPutServiceImpl"},
 
     "putAcceptanceWarehousing": {"name": "验收入库单", "key": "com.skyeye.machin.service.impl.ErpAcceptanceReceiptServiceImpl"},
     "machinHeader": {"name": "加工单", "key": "com.skyeye.machin.service.impl.ErpMachinServiceImpl"},