Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

README.md

@@ -11,6 +11,7 @@
 - Skyeye 云系列功能导图：[地址](https://www.zhixi.com/tpl/8556d62b08ac5d98468ad26dc418fe91?shared=true)
 - [Skyeye云系列资料](https://docs.qq.com/doc/DYUxuT3pSdGhVVXFC)
 - **接前端 / Java后端等课程设计以及毕设制作，有需要的可加下方微信**
+- **体验地址联系作者获取**
 
 ### 操作文档
 

erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js

@@ -42,6 +42,12 @@ layui.config({
 			{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
 					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
 				}},
+			{ field: 'machinOrderState', title: '加工状态', rowspan: '2', width: 90, templet: function (d) {
+					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionMachinOrderState", 'id', d.machinOrderState, 'name');
+				}},
+			{ field: 'outState', title: '委外状态', rowspan: '2', width: 90, templet: function (d) {
+					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionOutState", 'id', d.outState, 'name');
+				}},
 			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', rowspan: '2',width: 120 },
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', rowspan: '2',width: 150 },
 			{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', rowspan: '2',width: 120 },
@@ -72,7 +78,11 @@ layui.config({
         	edit(data);
         } else if (layEvent === 'details') { //详情
         	details(data);
-        } else if (layEvent === 'subApproval') { //提交审核
+        } else if (layEvent === 'turnEntireOrderToOutsourcing') { //转整单委外
+			turnEntireOrderToOutsourcing(data);
+		} else if (layEvent === 'turnConversionProcessingOrder') { //转加工单
+			turnConversionProcessingOrder(data);
+		} else if (layEvent === 'subApproval') { //提交审核
 			subApproval(data);
         } else if (layEvent === 'processDetails') { // 工作流流程详情查看
 			activitiUtil.activitiDetails(data);
@@ -81,6 +91,32 @@ layui.config({
 		}
 	});
 
+	// 转整单委外
+	function turnEntireOrderToOutsourcing(data) {
+		_openNewWindows({
+			url: "../../tpl/wholeOut/productionPlanToOutsourcing.html?id=" + data.id,
+			title: "转整单委外",
+			pageId: "productionPlanToOutsourcing",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+	}
+
+	// 转加工单
+	function turnConversionProcessingOrder(data) {
+		_openNewWindows({
+			url: "../../tpl/wholeOut/productionPlanToOutsourcing.html?id=" + data.id,
+			title: "转加工单",
+			pageId: "turnConversionProcessingOrder",
+			area: ['90vw', '90vh'],
+			callBack: function (refreshCode) {
+				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+				loadTable();
+			}});
+	}
+
 	// 新增
 	$("body").on("click", "#addBean", function() {
 		_openNewWindows({

erp-produce/src/main/resources/template/js/wholeOut/productionPlanToOutsourcing.js

+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+
+    // 生产计划转整单委外
+    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryPatchOutLetTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            // 仓库出库的【编辑布局】
+            dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, {
+                savePreParams: function (params) {
+                    params.farmId=data.farmId
+                    params.departmentId=data.departmentId
+                    params.salesman=data.salesman
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertPatchOutLetToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("div[controlType='correspondentAllEnter']").remove();
+                    $("div[controlType='depotOutFromType']").remove();
+                },
+                tableAddRowCallback: function (tableId) {
+                    $("#addRow" + tableId).remove();
+                    $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true);
+                }
+            });
+        }});
+
+});
\ No newline at end of file

erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js

@@ -34,12 +34,7 @@ layui.config({
                     }
                     return str;
                 }},
-            // { field: 'departmentId', width: 150, title: '部门', align: 'center',templet: function (d) {
-            //         if (!isNull(d.departmentMation)) {
-            //             return d.departmentMation.name;
-            //         }
-            //         return '';
-            //     }},
+            // { field: 'department', width: 150, title: '部门', align: 'center'},
             // // { field: 'farmId', width: 150, title: '车间', align: 'center'},
             //
             // { field: 'farmId', title: '车间', align: 'left', width: 150, templet: function (d) {
@@ -51,7 +46,6 @@ layui.config({
             //
             { field: 'operTime', width: 150, title: '单据日期', align: 'center'},
             { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'center', width: 120 },
-            // { field: 'farmId', width: 150, title: '车间', align: 'center'},
             { field: 'holderMation', title: '客户', rowspan: '2', align: 'center', width: 150, templet: function (d) {
                     return getNotUndefinedVal(d.holderMation?.name);
                 }},

erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html

@@ -34,14 +34,14 @@
 			{{# } }}
 
             {{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
-                {{# if (d.productionType == 1) { }}
-                    {{# if (auth('1720796297124')) { }}
-                        <a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转加工单</a>
+                {{# if (d.machinOrderState == 2 ||d.machinOrderState == 3) { }}
+                    {{# if (auth('1720795842911')) { }}
+                        <a class="layui-btn layui-btn-xs" lay-event="turnConversionProcessingOrder">转加工单</a>
                     {{# } }}
                 {{# } }}
-                {{# if (d.productionType == 2 ) { }}
-                    {{# if (auth('1720835673573')) { }}
-                        <a class="layui-btn layui-btn-xs" lay-event="transferToWaybill">转整单委外单</a>
+                {{# if (d.outState == 2 ||d.outState == 3) { }}
+                    {{# if (auth('1721215714124')) { }}
+                        <a class="layui-btn layui-btn-xs" lay-event="turnEntireOrderToOutsourcing">转整单委外</a>
                     {{# } }}
                 {{# } }}
             {{# } }}

erp-produce/src/main/resources/template/tpl/wholeOut/productionPlanToOutsourcing.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 style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" id="showForm" autocomplete="off">
+        <div id="content"></div>
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" type="button" id="cancle">
+                    <language showName="com.skyeye.cancel"></language>
+                </button>
+                <button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>
+                <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
+            </div>
+        </div>
+    </form>
+</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/wholeOut/'}).use('productionPlanToOutsourcing');
+</script>
+</body>
+</html>
\ No newline at end of file

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

@@ -41,8 +41,8 @@ layui.config({
             { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
                 }},
-            { field: 'otherState', title: '出库状态', width: 90, templet: function (d) {
-                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name');
+            { field: 'otherState', title: '确认状态', width: 90, templet: function (d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name');
             }},
             { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
         ]],

web/src/main/resources/template/js/index/login.js

@@ -14,6 +14,7 @@ layui.config({
 		// 系统配置文件
 		jsGetJsonFile("../../configRation.json?env=" + env, function(data) {
 			sysMainMation = data;
+			$(".lock-body").css({'background-image': 'url("' + sysMainMation.fileBasePath + '/images/upload/winbgpic/default.jpg")'});
 			localStorage.setItem("sysMainMation", JSON.stringify(sysMainMation));
 		});
 
@@ -52,8 +53,6 @@ layui.config({
 		// 修改版权
 		$(".copyright-content").html(sysMainMation.copyright);
 		
-		$(".lock-body").css({'background-image': 'url("/images/upload/winbgpic/default.jpg")'});
-		
 		localStorage.setItem('userToken', "");
 
 		matchingLanguage();

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

@@ -55,6 +55,8 @@
     "outLetState": {"name": "领料/补料单出库状态", "className": "skyeye-erp#com.skyeye.pick.classenum.OutLetState"},
     "depotOutOtherState": {"name": "待确认物料单确认状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotOutOtherState"},
     "putState": {"name": "退料单入库状态", "className": "skyeye-erp#com.skyeye.pick.classenum.PutState"},
+    "productionMachinOrderState": {"name": "生产计划单下达加工单的状态", "className": "skyeye-erp#com.skyeye.production.classenum.ProductionMachinOrderState"},
+    "productionOutState": {"name": "生产计划单委外状态", "className": "skyeye-erp#com.skyeye.production.classenum.ProductionOutState"},
     "machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"},
     "machinProcedureAcceptChildType": {"name": "工序验收单耗材类型枚举", "className": "skyeye-erp#com.skyeye.machinprocedure.classenum.MachinProcedureAcceptChildType"},
     "materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"},