diff --git a/erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js b/erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js b/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8fe155760d3ef51b1c38b65acb6a3b60dec0790a 100644
--- a/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
+++ b/erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
@@ -0,0 +1,167 @@
+
+var rowId = "";
+
+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;
+
+    // 新增
+    authBtn('1720835673573');
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.erpBasePath + 'queryWholeOrderOutList',
+        where: getTableParams(),
+        even: true,
+        page: true,
+        limits: getLimits(),
+        limit: getLimit(),
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'oddNumber', title: '生产单号', align: 'center', width: 200, templet: function (d) {
+                    return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+                }},
+            { field: 'salesOrderNum', width: 200, title: '关联销售单', align: 'center', templet: function (d) {return isNull(d.sealOrderMation) ? '' : d.sealOrderMation.oddNumber}},
+            { field: 'name', title: '产品名称', align: 'left',width: 150, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.name}},
+            { field: 'model', title: '产品型号', align: 'left',width: 150, templet: function (d) {return isNull(d.materialMation) ? '' : d.materialMation.model}},
+            { field: 'norms', title: '产品规格', align: 'left',width: 150, templet: function (d) {return isNull(d.normsMation) ? '' : d.normsMation.name}},
+            { field: 'number', width: 100, title: '计划生产数量'},
+            { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
+                    return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+                }},
+            { field: 'state', title: '状态', width: 90, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+                }},
+            { field: 'planStartDate', width: 150, align: 'center', title: '计划开始时间'},
+            { field: 'planComplateDate', width: 150, align: 'center', title: '计划结束时间'},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, 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 === 'delete') { //删除
+            del(data, obj);
+        } else if (layEvent === 'edit') { //编辑
+            edit(data);
+        } else if (layEvent === 'details') { //详情
+            details(data);
+        } else if (layEvent === 'subApproval') { //提交审核
+            subApproval(data);
+        } else if (layEvent === 'processDetails') { // 工作流流程详情查看
+            activitiUtil.activitiDetails(data);
+        } else if (layEvent === 'revoke') { //撤销
+            revoke(data);
+        }
+    });
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024071300002', null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "erpProductionAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024071300003&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "erpProductionEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        _openNewWindows({
+            url:  systemCommonUtil.getUrl('FP2024071300004&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "erpProductionDetail",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    // // 删除
+    // function del(data, obj) {
+    //     layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+    //         layer.close(index);
+    //         AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteProductionById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+    //                 winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+    //                 loadTable();
+    //             }});
+    //     });
+    // }
+
+    // // 提交审批
+    // function subApproval(data) {
+    //     layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
+    //         layer.close(index);
+    //         activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
+    //             var params = {
+    //                 id: data.id,
+    //                 approvalId: approvalId
+    //             };
+    //             AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpproduction007", params: params, type: 'json', method: 'POST', callback: function (json) {
+    //                     winui.window.msg("提交成功", {icon: 1, time: 2000});
+    //                     loadTable();
+    //                 }});
+    //         });
+    //     });
+    // }
+
+    // // 撤销
+    // function revoke(data) {
+    //     layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
+    //         layer.close(index);
+    //         AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeProduction", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
+    //                 winui.window.msg("提交成功", {icon: 1, time: 2000});
+    //                 loadTable();
+    //             }});
+    //     });
+    // }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('wholeOutList', {});
+});
diff --git a/erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html b/erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html
new file mode 100644
index 0000000000000000000000000000000000000000..e149a394349cb3c0686232eeefc0b7f98e351608
--- /dev/null
+++ b/erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html
index 566549bdf8fae810809c1a81066000687cb338f6..b7006d00c3666f011e7ca2ca4d119ed6abe5e5d0 100644
--- a/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html
+++ b/erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html
@@ -1,10 +1,44 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <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>
+        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1590913527206"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+    <script type="text/html" id="tableBar">
+        {{# if(d.editRow == 1) { }}
+            {{# if(auth('1720705286166')) { }}
+                <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+            {{# } }}
+            {{# if(auth('1590913527206')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+            {{# } }}
+            {{# if(auth('1590926876459')) { }}
+                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+            {{# } }}
+        {{# } }}
 
+        {{# if(d.editRow == 2) { }}
+            {{# if(auth('1696246760629')) { }}
+                <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</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/wholeOut/'}).use('wholeOutList');
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp/src/main/resources/template/js/erpcommon/loadStock.js b/erp/src/main/resources/template/js/erpcommon/loadStock.js
index bf0fc3eb5691256d0d68790ace0894df19f08fe7..9c73ed0b207e8850743d3912d97a46309053f3e6 100644
--- a/erp/src/main/resources/template/js/erpcommon/loadStock.js
+++ b/erp/src/main/resources/template/js/erpcommon/loadStock.js
@@ -85,8 +85,9 @@ function inTableDataArrayByAssetarId(materialId, unitId, array) {
  * @param allChooseProduct 商品对象
  * @param unitPriceKey 单价显示的key，不用的单据类型展示不同的商品价格类型(零售价，最低售价，销售价等)
  * @param calcPriceCallback 计算价格回调的函数
+ * @param callback 变化回调函数
  */
-function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallback) {
+function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallback, callback) {
     // 商品规格加载变化事件
     form.on('select(selectUnitProperty)', function(data) {
         var thisRowValue = data.value;
@@ -101,6 +102,9 @@ function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallbac
                     var unitPrice = parseFloat(bean[unitPriceKey]).toFixed(2);
                     $("#unitPrice" + thisRowKey).val(unitPrice);
                     $("#amountOfMoney" + thisRowKey).val((rkNum * parseFloat(unitPrice)).toFixed(2));
+                    if (typeof callback == "function") {
+                        callback(thisRowKey, bean);
+                    }
                     return false;
                 }
             });
@@ -108,6 +112,9 @@ function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallbac
             // 重置单价以及金额为空
             $("#unitPrice" + thisRowKey).val("0.00");
             $("#amountOfMoney" + thisRowKey).val("0.00");
+            if (typeof callback == "function") {
+                callback(thisRowKey, null);
+            }
         }
         var depotId = isNull($("#depotId").val()) ? "" : $("#depotId").val();
         // 加载库存
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json
index 4dd8ff8b8fccf670367847cdc68d71214c3e7ca7..162d21a0c7d52959e2c7a7b88c13f1b753a7109e 100644
--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/web/src/main/resources/template/json/skyeyeClassEnum.json
@@ -83,6 +83,7 @@
     "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"},
+    "productionChildFromType": {"name": "生产计划单子单据生产类型", "className": "skyeye-erp#com.skyeye.production.classenum.ProductionChildType"},
 
     "skyeyeView": {"name": "视图类型", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"},
     "widthScale": {"name": "宽度比例", "className": "skyeye-pro#com.skyeye.attr.classenum.WidthScale"},