diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java
index 5722f96..fda6dd3 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java
@@ -2007,7 +2007,7 @@ public class InvoiceController {
 		MaterialshipRequest materialShipRequest = JSON.toJavaObject(in, MaterialshipRequest.class);
 		String shipRequestName2 = materialShipRequest.getShipRequestName();
 		//根据单据类型判断生产订单类型，如果是领料单且单据类型是复卷和返工的不卡控批次质量状态
-		String dTypeSql = "SELECT M.PRODUCTORDERTYPE,M.PRODUCTORDERNO FROM MATERIALSHIPREQUEST M WHERE M.SHIPREQUESTNAME = :SHIPREQUESTNAME";
+		String dTypeSql = "SELECT M.AUART FROM MATERIALSHIPREQUESTDETAIL M WHERE M.SHIPREQUESTNAME = :SHIPREQUESTNAME";
 		Map<String, Object> hashMap3 = new HashMap<String,Object> ();
 		hashMap3.put("SHIPREQUESTNAME", shipRequestName2);
 		String productOrderType = "";
@@ -2015,8 +2015,8 @@ public class InvoiceController {
 		List<Map<String, Object>> queryForListW = new ArrayList<>();
 		List<Map<String, Object>> queryForList3 = IDMFrameServiceProxy.getSqlTemplate().queryForList(dTypeSql, hashMap3);
 		if (queryForList3 != null && queryForList3.size() > 0) {
-			productOrderType = queryForList3.get(0).get("PRODUCTORDERTYPE") == null ? "" :queryForList3.get(0).get("PRODUCTORDERTYPE").toString();
-			productOrderNo = queryForList3.get(0).get("PRODUCTORDERNO") == null ? "" :queryForList3.get(0).get("PRODUCTORDERNO").toString();
+			productOrderType = queryForList3.get(0).get("AUART") == null ? "" :queryForList3.get(0).get("AUART").toString();
+			productOrderNo = queryForList3.get(0).get("AUART") == null ? "" :queryForList3.get(0).get("AUART").toString();
 			
 			// 查询工单维护表 是否有对应的生产订单
 			String workSql = "SELECT w.WORKORDER FROM WORKORDER w WHERE w.WORKORDER =:WORKORDER";
@@ -2065,14 +2065,12 @@ public class InvoiceController {
 			if (!"Stocked".equals(stockState)) {
 				return AjaxResult.me().setSuccess(false).setMessage("条码不在库！");
 			}
-			if (!"OK".equals(packinggrade) && (!"55A2-02".equals(productOrderType) && !"55A2-Cxx-08".equals(productOrderType) 
-					&& !"4455-Cxx-10".equals(productOrderType)   && !"4455-Cxx-01".equals(productOrderType) 
-					 && !"5X-Cxx-07".equals(productOrderType)) && (queryForListW == null || queryForListW.size() < 1)) {//复卷，返工工单
+			if (!"OK".equals(packinggrade) && (!"ZP01".equals(productOrderType) && !"ZP05".equals(productOrderType))
+					&& (queryForListW == null || queryForListW.size() < 1)) {//复卷，返工工单
 				return AjaxResult.me().setSuccess(false).setMessage("单据类型不为复卷或 返工, 引膜领用和研发领用, 批次不合格不能出库！");
 			}
-			if (!"1".equals(exp)  && (!"55A2-02".equals(productOrderType) && !"55A2-Cxx-08".equals(productOrderType) 
-					&& !"4455-Cxx-10".equals(productOrderType)   && !"4455-Cxx-01".equals(productOrderType) 
-					 && !"5X-Cxx-07".equals(productOrderType)) && (queryForListW == null || queryForListW.size() < 1)) {//复卷，返工工单
+			if (!"1".equals(exp)  && (!"ZP01".equals(productOrderType) && !"ZP05".equals(productOrderType))
+					&& (queryForListW == null || queryForListW.size() < 1)) {//复卷，返工工单
 				return AjaxResult.me().setSuccess(false).setMessage("单据类型不为复卷或 返工, 引膜领用和研发领用, 批次已过期！");
 			}
 			if (!"END".equals(oqaresultstate)) {
@@ -2185,13 +2183,13 @@ public class InvoiceController {
 		MaterialshipRequest materialShipRequest = JSON.toJavaObject(in, MaterialshipRequest.class);
 		String shipRequestName2 = materialShipRequest.getShipRequestName();
 		//根据单据类型判断生产订单类型，如果是领料单且单据类型是复卷和返工的不卡控批次质量状态
-		String dTypeSql = "SELECT M.PRODUCTORDERTYPE FROM MATERIALSHIPREQUEST M WHERE M.SHIPREQUESTNAME = :SHIPREQUESTNAME";
+		String dTypeSql = "SELECT M.AUART FROM MATERIALSHIPREQUESTDETAIL M WHERE M.SHIPREQUESTNAME = :SHIPREQUESTNAME";
 		Map<String, Object> hashMap3 = new HashMap<String,Object> ();
 		hashMap3.put("SHIPREQUESTNAME", shipRequestName2);
 		String productOrderType = "";
 		List<Map<String, Object>> queryForList3 = IDMFrameServiceProxy.getSqlTemplate().queryForList(dTypeSql, hashMap3);
 		if (queryForList3 != null && queryForList3.size() > 0) {
-			productOrderType = queryForList3.get(0).get("PRODUCTORDERTYPE") == null ? "" :queryForList3.get(0).get("PRODUCTORDERTYPE").toString();
+			productOrderType = queryForList3.get(0).get("AUART") == null ? "" :queryForList3.get(0).get("AUART").toString();
 		}
 		String type = materialShipRequest.getType();//Assign 备货 Dessign 解绑
 		String materialPackingName = materialShipRequest.getMaterialPackingName();//标签
@@ -2235,14 +2233,12 @@ public class InvoiceController {
 			if (!"Stocked".equals(stockState)) {
 				return AjaxResult.me().setSuccess(false).setMessage("条码不在库！");
 			}
-			if (!"OK".equals(packinggrade) && (!"55A2-02".equals(productOrderType) && !"55A2-Cxx-08".equals(productOrderType) 
-					&& !"4455-Cxx-10".equals(productOrderType)   && !"455-Cxx-01".equals(productOrderType) 
-					 && !"5X-Cxx-07".equals(productOrderType))) {//复卷，返工工单
+			if (!"OK".equals(packinggrade) &&
+					(!"ZP01".equals(productOrderType) && !"ZP05".equals(productOrderType))) {//复卷，返工工单
 				return AjaxResult.me().setSuccess(false).setMessage("单据类型不为复卷或 返工, 引膜领用和研发领用, 批次不合格不能出库！");
 			}
-			if (!"1".equals(exp)  && (!"55A2-02".equals(productOrderType) && !"55A2-Cxx-08".equals(productOrderType) 
-					&& !"4455-Cxx-10".equals(productOrderType)   && !"455-Cxx-01".equals(productOrderType) 
-					 && !"5X-Cxx-07".equals(productOrderType))) {//复卷，返工工单
+			if (!"1".equals(exp)  &&
+					(!"ZP01".equals(productOrderType) && !"ZP05".equals(productOrderType))) {//复卷，返工工单
 				return AjaxResult.me().setSuccess(false).setMessage("单据类型不为复卷或 返工, 引膜领用和研发领用, 批次已过期！");
 			}
 			if (!"END".equals(oqaresultstate)) {
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
index 81133f5..87d9f2a 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
@@ -888,14 +888,14 @@ public class SaleOutController {
 		MaterialshipRequest materialShipRequest = JSON.toJavaObject(in, MaterialshipRequest.class);
 		String shipRequestName2 = materialShipRequest.getShipRequestName();
 		//根据单据类型判断生产订单类型，如果是领料单且单据类型是复卷和返工的不卡控批次质量状态
-		String dTypeSql = "SELECT M.PRODUCTORDERTYPE,M.PRODUCTORDERNO FROM MATERIALSHIPREQUEST M WHERE M.SHIPREQUESTNAME = :SHIPREQUESTNAME";
+		String dTypeSql = "SELECT M.AUART FROM MATERIALSHIPREQUESTDETAIL M WHERE M.SHIPREQUESTNAME = :SHIPREQUESTNAME";
 		Map<String, Object> hashMap3 = new HashMap<String,Object> ();
 		hashMap3.put("SHIPREQUESTNAME", shipRequestName2);
 		String productOrderType = "";
 		List<Map<String, Object>> queryForListW = new ArrayList<>();
 		List<Map<String, Object>> queryForList3 = IDMFrameServiceProxy.getSqlTemplate().queryForList(dTypeSql, hashMap3);
 		if (queryForList3 != null && queryForList3.size() > 0) {
-			productOrderType = queryForList3.get(0).get("PRODUCTORDERTYPE") == null ? "" :queryForList3.get(0).get("PRODUCTORDERTYPE").toString();
+			productOrderType = queryForList3.get(0).get("AUART") == null ? "" :queryForList3.get(0).get("AUART").toString();
 		}
 
 		// 查询工单维护表 是否有对应的生产订单
@@ -905,9 +905,8 @@ public class SaleOutController {
 		queryForListW = IDMFrameServiceProxy.getSqlTemplate().queryForList(workSql, hashMapW);
 
 		String IsCheck = "N";  // 是否可以为不良和过期
-		if (("55A2-02".equals(productOrderType) || "55A2-Cxx-08".equals(productOrderType)
-				|| "4455-Cxx-10".equals(productOrderType) || "4455-Cxx-01".equals(productOrderType)
-				|| "5X-Cxx-07".equals(productOrderType)) || (queryForListW != null && !queryForListW.isEmpty())) {//复卷，返工工单
+		if (("ZP01".equals(productOrderType) || "ZP05".equals(productOrderType)) ||
+				(queryForListW != null && !queryForListW.isEmpty())) {//复卷，返工工单
 			IsCheck = "Y";
 		}
 		return AjaxResult.me().setResultObj(IsCheck);