diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java
index bbeda1b..c71de61 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java
@@ -41,7 +41,8 @@ public class MESServiceImpl implements MESService{
 				"				 ORDER BY m5.USEDATE,m5.SHIPREQUESTDETAILNAME FETCH FIRST ROW ONLY)WO\r\n" + 
 				"				 FROM MATERIALPACKING m ,MATERIALSPEC m2 ,MATERIALSHIPREQUEST m3 ,BS_MATERIALDESCRIPTION m4 ,BS_MATERIALUNIT bm  \r\n" + 
 				"				 WHERE m.SITENAME =:SITENAME  \r\n" + 
-				"				 AND m.SHIPREQUESTNAME =:SHIPREQUESTNAME \r\n" + 
+				"				 AND m.SHIPREQUESTNAME =:SHIPREQUESTNAME \r\n" +
+				"				 AND m4.LANGUAGE = 'ZH' \r\n" +
 				"				 AND (m.RECEIVEACTNO =:RECEIVEACTNO OR :RECEIVEACTNO IS NULL ) \r\n" + 
 				"				 AND m.MATERIALSPECNAME =m2.MATERIALSPECNAME  \r\n" + 
 				"				 AND m.SHIPREQUESTNAME =m3.SHIPREQUESTNAME  \r\n" + 
diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
index e945980..3c1103a 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
@@ -3828,7 +3828,7 @@ public class ToSAPServiceImpl {
         .append("  	MP.MATERIALSPECNAME,   ").append(SystemPropHelper.CR)
         .append("  	MD.ERPFACTORY,   ").append(SystemPropHelper.CR)
         .append("  	MP.ERPLOCATION,   ").append(SystemPropHelper.CR)
-        .append("  	DECODE(MP.PACKINGGRADE,'OK','','NG','3','2')PACKINGGRADE,   ").append(SystemPropHelper.CR)
+        .append("  	DECODE(MP.PACKINGGRADE,'OK','','NG','','2')PACKINGGRADE,   ").append(SystemPropHelper.CR)
         .append("  	SUM(MP.MATERIALQUANTITY) AS MATERIALQUANTITY ,	   ").append(SystemPropHelper.CR)
         .append("  	MP.UNIT,   ").append(SystemPropHelper.CR)
         .append("  	MD.MATERIALUNIT,   ").append(SystemPropHelper.CR)
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
index b96f7fc..988bf2e 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
@@ -530,7 +530,7 @@ public class InvoiceServiceImpl implements InvoiceService {
 						arrayList.add(materialPackingKey);
 					}
 					billCode = UnSourcedChangeLocation(arrayList,ERPRECEIVEFACTORY,
-							ERPRECEIVELOCATION, "", eventUser );
+							ERPRECEIVELOCATION, "", eventUser, commitDate );
 
 					List<MaterialPackingKey> mpKeyList = new ArrayList<MaterialPackingKey> ();
 					SetEventInfo setEventInfo = new SetEventInfo();
@@ -795,7 +795,7 @@ public class InvoiceServiceImpl implements InvoiceService {
 										 String aimFactory,
 										 String aimERPlocation,
 										 String aimLocationName,
-										 String user) throws Exception {
+										 String user, String commitDate) throws Exception {
 		String rcode;
 		String undoId = "";
 		String rmsg = null;
@@ -854,9 +854,13 @@ public class InvoiceServiceImpl implements InvoiceService {
 			body.put("ITEM", itemArray);
 			body.put("ITEMID", uniqueID);
 			//过账日期
-			body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+			SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd");
+			Date date = inputFormat.parse(commitDate);
+			String outputDate = outputFormat.format(date);
+			body.put("BUDAT", outputDate);
 			//凭证日期
-			body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+			body.put("BLDAT", outputDate);
 			//凭证抬头文本
 			body.put("BKTXT", uniqueID);
 			//用户名
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialShipServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialShipServiceImpl.java
index 820162d..be18fb5 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialShipServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialShipServiceImpl.java
@@ -890,7 +890,7 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
 				else
 				{
 
-					billCode=ProductionStockOut_NEW(shipRequestName, "SDK", user,materialPackingKeyList);
+					billCode=ProductionStockOut_NEW(shipRequestName, "SDK", user,materialPackingKeyList,commitDate);
 					if (billCode.isEmpty()) {
 						return AjaxResult.me().setSuccess(false).setMessage("SAP过账异常！").setErrorCode(400);
 					}
@@ -906,7 +906,7 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
 			case "06"://成本中心领料
 			case "09"://研发领料
 //				billCode=toSAPService.orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList);
-				billCode=orderStockOut(shipRequestName, "SDK", user,materialPackingKeyList);
+				billCode=orderStockOut(shipRequestName, "SDK", user,materialPackingKeyList,commitDate);
 				//更新MES管芯数据
 				new MESServiceImpl().updateDurable_ByCostcenter(shipRequestName, "SDK", user, materialPackingKeyList);
 				//billCode = NCWServiceImpl.SaleOut2(shipRequestName, "SDK", eventUser,materialPackingKeyList,"");
@@ -1103,7 +1103,7 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
 
 	}
 
-	public String ProductionStockOut_NEW(String shipRequestName, String siteName, String user,List<String> boxList) throws Exception {
+	public String ProductionStockOut_NEW(String shipRequestName, String siteName, String user,List<String> boxList,String commitDate) throws Exception {
 
 		String rcode;
 		String undoId = "";
@@ -1205,9 +1205,13 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
 			body.put("ITEM", itemArray);
 			body.put("ITEMID", uniqueID);
 			//过账日期
-			body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+			SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd");
+			Date date = inputFormat.parse(commitDate);
+			String outputDate = outputFormat.format(date);
+			body.put("BUDAT", outputDate);
 			//凭证日期
-			body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+			body.put("BLDAT", outputDate);
 			//凭证抬头文本
 			body.put("BKTXT", uniqueID);
 			//用户名
@@ -1292,7 +1296,7 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
 		return undoId;
 	}
 
-	public String orderStockOut(String shipRequestName, String siteName, String user,List<String> boxList) throws Exception {
+	public String orderStockOut(String shipRequestName, String siteName, String user,List<String> boxList, String commitDate) throws Exception {
 
 		String rcode;
 		String undoId = "";
@@ -1374,9 +1378,13 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
 			body.put("ITEM", itemArray);
 			body.put("ITEMID", uniqueID);
 			//过账日期
-			body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+			SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd");
+			Date date = inputFormat.parse(commitDate);
+			String outputDate = outputFormat.format(date);
+			body.put("BUDAT", outputDate);
 			//凭证日期
-			body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+			body.put("BLDAT", outputDate);
 			//凭证抬头文本
 			body.put("BKTXT", uniqueID);
 			//用户名