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

erp/src/main/resources/template/js/materialCode/materialCodeReportList.js

@@ -47,6 +47,9 @@ layui.config({
 			{ 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: 'type', title: '类型', align: 'center', width: 100, templet: function(d) {
+					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialNormsCodeType", 'id', d.type, 'name');
+				}},
 			{ field: 'inDepot', title: '状态', align: 'center', width: 100, templet: function(d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialNormsCodeInDepot", 'id', d.inDepot, 'name');
 			}},

erp/src/main/resources/template/js/salesOrder/salesOrderList.js

@@ -43,7 +43,7 @@ layui.config({
             { 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 },
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' }
+            { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 300, toolbar: '#tableBar' }
         ], [
             { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("purchaseOrderFromType", 'id', d.fromTypeId, 'name');
@@ -79,6 +79,8 @@ layui.config({
         	turnSales(data);
         } else if (layEvent === 'turnReturns') { //转销售退货单
             turnReturns(data);
+        }else if (layEvent === 'turnToPreProductionPlan') { //转预生产计划单
+            turnToPreProductionPlan(data);
         } else if (layEvent === 'processDetails') { // 工作流流程详情查看
             activitiUtil.activitiDetails(data);
         } else if (layEvent === 'revoke') { //撤销
@@ -151,6 +153,19 @@ layui.config({
             }});
     }
 
+    // 销售订单转预生产计划
+    function turnToPreProductionPlan(data) {
+        _openNewWindows({
+            url:"../../tpl/salesOrder/salesOrderToPreProductionPlan.html?id=" + data.id,
+            title: "转预生产计划",
+            pageId: "salesOrderToReturns",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
     form.render();
     $("body").on("click", "#reloadTable", function() {
         loadTable();

erp/src/main/resources/template/js/salesOrder/salesOrderToOutlet.js

@@ -21,6 +21,8 @@ layui.config({
             // 销售出库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2023042700002', data, {
                 savePreParams: function (params) {
+                    params.holderId=data.holderId
+                    params.holderKey=data.holderKey
                 },
                 saveData: function (params) {
                     // 保存数据
@@ -29,6 +31,9 @@ layui.config({
                             parent.refreshCode = '0';
                         }});
                 },
+                loadComponentCallback: function () {
+                    $("div[controlType='sealOutLetFromType']").remove();
+                },
 
                 // 新增行的回调函数
                 tableAddRowCallback: function (tableId) {
@@ -40,6 +45,7 @@ layui.config({
                     $("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(".normsId").prop('disabled', true);
                 }
             });
         }});

erp/src/main/resources/template/js/salesOrder/salesOrderToPreProductionPlan.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 + "querySealsOrderTransProductionPlanById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            data.productionPlanChildList=data.erpOrderItemList
+            // 预生产计划的【编辑布局】
+            dsFormUtil.initEditPageForStatic('content', 'FP2024071100002', data, {
+                savePreParams: function (params) {
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertSealsOrderToProductionPlan", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("div[controlType='sealOutLetFromType']").remove();
+                },
+
+                // 新增行的回调函数
+                tableAddRowCallback: function (tableId) {
+                    $("#addRow" + tableId).remove();
+                    $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+                }
+            });
+        }});
+});
\ No newline at end of file

erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js

@@ -21,8 +21,11 @@ layui.config({
             // 销售退货的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2023042700006', data, {
                 savePreParams: function (params) {
+                    params.holderId=data.holderId
+                    params.holderKey=data.holderKey
                 },
                 saveData: function (params) {
+                    console.log(params)
                     // 保存数据
                     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertSealsOrderToSealsReturns", params: params, type: 'json', method: "POST", callback: function(json) {
                             parent.layer.close(index);
@@ -30,6 +33,10 @@ layui.config({
                         }});
                 },
 
+                loadComponentCallback: function () {
+                    $("div[controlType='sealReturnFromType']").remove();
+                },
+
                 // 新增行的回调函数
                 tableAddRowCallback: function (tableId) {
                     $("#addRow" + tableId).remove();

erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html

@@ -42,6 +42,11 @@
 					<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转销售退货</a>
 				{{# } }}
 			{{# } }}
+			{{# if(d.state == 'pass' || d.state == 'partiallyCompleted') { }}
+				{{# if(auth('1721375510008')){ }}
+					<a class="layui-btn layui-btn-xs" lay-event="turnToPreProductionPlan">转预生产计划</a>
+				{{# } }}
+			{{# } }}
 		</script>
 	</div>
 	<script src="../../assets/lib/layui/layui.js"></script>

erp/src/main/resources/template/tpl/salesOrder/salesOrderToPreProductionPlan.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/salesOrder/'}).use('salesOrderToPreProductionPlan');
+</script>
+</body>
+</html>
\ No newline at end of file

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

@@ -42,6 +42,7 @@
 
     "materialFromType": {"name": "商品来源类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialFromType"},
     "materialItemCode": {"name": "商品条形码开启类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialItemCode"},
+    "materialNormsCodeType": {"name": "条形码商品规格类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeType"},
     "materialType": {"name": "商品类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialType"},
     "materialUnit": {"name": "规格类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialUnit"},
     "materialNormsStockType": {"name": "商品规格库存类型", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsStockType"},