fix：修改备货出库

zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java

@@ -187,6 +187,20 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
 	private String supplierNO;
 	@UserColumnMark
 	private String erpFactory;
+	@UserColumnMark
+	private String deliveryAddress;
+	@UserColumnMark
+	private String auart;
+
+	public String getDeliveryAddress() {
+		return deliveryAddress;
+	}
+
+	public void setDeliveryAddress(String deliveryAddress) {
+		this.deliveryAddress = deliveryAddress;
+	}
+
+
 
 	public String getAuart() {
 		return auart;
@@ -196,8 +210,7 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
 		this.auart = auart;
 	}
 
-	@UserColumnMark
+
-	private String auart;
 
 	public String getSaleOutQuantity() {
 		return saleOutQuantity;

zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java

@@ -5851,6 +5851,7 @@ public class ToSAPServiceImpl {
             erplog.setEventName("盘点");
             erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
             erplog.setMessageId(UUID.randomUUID().toString());
+            erplog.setSendMsg(sendData.toJSONString());
             erplog.setSendMsg2(sendData.toJSONString());
             erplog.setReturnMsg2(sapreturn);
             erplog.setResultCode(rcode);

zi-wms-pda/src/main/java/com/cim/idm/controller/CheckMarkController.java

@@ -157,6 +157,11 @@ public class CheckMarkController {
 				{
 					//调用SAP接口
 					billCode=toSAPServiceImpl.qtcrNoInvoiceForCheckPlan(sr_pk, "qtc", user, commitDate,opCode,costName);
+
+					if("".equals(billCode) || billCode == null) {
+						return AjaxResult.me().setErrorCode(500).setSuccess(false).setMessage("SAP过账失败");
+					}
+
 					//更新盘点计划状态
 					String sql = "UPDATE CHECKPLAN c SET CHECKPLANSTATE = 'Approved' WHERE PLANDATE  = :PLANDATE AND CHECKPLANNAME = :CHECKPLANNAME AND ERPLOCATION=:ERPLOCATION";
 					IDMFrameServiceProxy.getSqlTemplate().update(sql, bindMap);
@@ -200,7 +205,7 @@ public class CheckMarkController {
 				bindMap.put("ERPLOCATION", erpLocation);
 				// 查找盘盈的批次
 				String sql_py = " SELECT a.*,ABS(DifferenceQuantity)NUM FROM (\r\n" + 
-						" SELECT	c.MATERIALPACKINGNAME,c.MATERIALSPECNAME,m.UNIT,c.ERPLOCATION,c.ACTLOCATION c.SYSLOCATION,m.ERPFACTORY,\r\n" +
+						" SELECT	c.MATERIALPACKINGNAME,c.MATERIALSPECNAME,m.UNIT,c.ERPLOCATION,c.ACTLOCATION SYSLOCATION,m.ERPFACTORY,\r\n" +
 						" NVL( c.MATERIALQUANTITY,0) AS MATERIALQUANTITY,NVL(c2.MATERIALQUANTITY, 0) AS MATERIALACTQUANTITY,	\r\n" +
 						"	(NVL(c.MATERIALQUANTITY, 0) -NVL(c2.MATERIALQUANTITY, 0)) AS DifferenceQuantity,c.CHECKPLATATE,c.CHECKPLANSTATE,\r\n" +
 						"	m.CHARGE ,m.SDK_ID ,m.PHASE ,TO_CHAR(m.EXPIRINGDATE, 'YYYY-MM-DD HH24:MI:SS') expdate,\r\n" + 

zi-wms-pda/src/main/java/com/cim/idm/controller/CheckPlanController.java

@@ -45,7 +45,7 @@ public class CheckPlanController {
 //				+ "FROM MATERIALPACKING m "
 //				+ "WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME AND m.SITENAME = :SITENAME AND STOCKSTATE = 'Stocked' ";
 
-				String sql = "SELECT m.MATERIALPACKINGNAME,m.ERPFACTORY ,m.ERPLOCATION ,m.LOCATIONNAME,m.MATERIALQUANTITY "
+				String sql = "SELECT m.MATERIALPACKINGNAME,m.ERPFACTORY ,m.ERPLOCATION ,m.LOCATIONNAME,m.MATERIALQUANTITY,m.StockOut "
 				+ "FROM MATERIALPACKING m "
 				+ "WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME AND m.SITENAME = :SITENAME AND (STOCKSTATE = 'Stocked' OR STOCKSTATE = 'StockOut') ";
 		Map<String, Object> bindMap = new HashMap<String, Object>();

zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java

@@ -1292,6 +1292,7 @@ public class SAPToWMSController {
 
 						String  xloek= MapUtils.getString(item, "xloek"); // 删除标识
 						String  auart= MapUtils.getString(item, "AUART"); // 接收生产订单类型  返工ZP05 复卷ZP01
+						String  lifnr= MapUtils.getString(item, "LIFNR"); //
 
 
 						MaterialShipRequestDetail mrd =new MaterialShipRequestDetail();
@@ -1403,6 +1404,8 @@ public class SAPToWMSController {
 									bindMapItem.put("phase", phase);
 									bindMapItem.put("saleOutQuantity", 0);
 									bindMapItem.put("auart", auart);
+									bindMapItem.put("deliveryAddress", lifnr);
+
 
 
 									if("07".equals(shipRequestType) || "03".equals(shipRequestType)) {

zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java

@@ -364,7 +364,7 @@ public class SaleOutController {
 //					return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
 //				}
 //			}
-		else if ("OEM".equals(shipRequestType)) { //委外出库
+		else if ("OEM".equals(shipRequestType) || "08".equals(shipRequestType)) { //委外出库
 			if ((allQty.subtract(minusQty)).compareTo(minQty)>0) {//只能超发一个
 				return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
 			}

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java

@@ -2581,7 +2581,8 @@ public class InvoiceServiceImpl implements InvoiceService {
 		String undoId = "";
 		String rmsg = null;
 		String sql="SELECT       \r\n" +
-				"        			MS.DELIVERYADDRESS,       \r\n" +
+//				"        			MS.DELIVERYADDRESS,       \r\n" +
+				"        			MD.DELIVERYADDRESS,       \r\n" + // 取详情
 				"        			MP.MATERIALSPECNAME,       \r\n" +
 				"        			MP.ERPFACTORY,       \r\n" +
 				"        			MP.ERPLOCATION,       \r\n" +
@@ -2613,7 +2614,7 @@ public class InvoiceServiceImpl implements InvoiceService {
 				"        			AND MP.STOCKSTATE = 'Stocked'\r\n" +
 				"        			AND mp.MATERIALPACKINGNAME IN (:BOXLIST)\r\n" +
 				"        		GROUP BY        \r\n" +
-				"        			MS.DELIVERYADDRESS,       \r\n" +
+				"        			MD.DELIVERYADDRESS,       \r\n" +
 				"        			MP.MATERIALSPECNAME,       \r\n" +
 				"        			MP.ERPFACTORY,       \r\n" +
 				"        			MP.ERPLOCATION,       \r\n" +