diff --git a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
index 13610dee05bbe33e3fa381454129bb3c1e102377..1cc638ca0931c14ca68d724c2f6cecbc836ba0c2 100644
--- a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js
+++ b/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 },
diff --git a/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html b/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html
index 9489722d6a4afeb03bb28f507fba69b10636d73c..954397cb435a89c99f34b5b3fdb4f0c5ed063e02 100644
--- a/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html
+++ b/erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionList.html
@@ -34,12 +34,12 @@
 			{{# } }}
 
             {{# if (d.state == 'pass' || d.state == 'partiallyCompleted') { }}
-                {{# if (d.productionType == 1) { }}
+                {{# if (d.machinOrderState == 2 ||d.machinOrderState == 3) { }}
                     {{# if (auth('1720796297124')) { }}
                         <a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转加工单</a>
                     {{# } }}
                 {{# } }}
-                {{# if (d.productionType == 2 ) { }}
+                {{# if (d.outState == 2 ||d.outState == 3) { }}
                     {{# if (auth('1720835673573')) { }}
                         <a class="layui-btn layui-btn-xs" lay-event="transferToWaybill">转整单委外单</a>
                     {{# } }}
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json
index 6ca84485dfcecd3e2ab016dd59053106854dfc0a..2a6a7cfd40ea7902f572e70b9cc14e081f501374 100644
--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/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"},