From a5ee5055f053cbb4f13710fc251adbd780f3a43f Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 31 八月 2022 17:28:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/slcf/controller/StockController.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/slcf/controller/StockController.java b/src/main/java/com/slcf/controller/StockController.java
index 466b5ea..741c1bd 100644
--- a/src/main/java/com/slcf/controller/StockController.java
+++ b/src/main/java/com/slcf/controller/StockController.java
@@ -55,7 +55,7 @@
 	SysLogService sysLogService;
 	@Autowired
 	RoleService roleService;
-	
+
 	Logger logger=Logger.getLogger(StockController.class);
 	
 	@RequestMapping("/goStock.action")
@@ -82,8 +82,6 @@
 	
 	/**
 	 * 鍒嗛〉鏌ヨ鎵�鏈�
-	 * @param pageNumber
-	 * @param pageSize
 	 * @return
 	 */
 	@ResponseBody
@@ -95,8 +93,6 @@
 	
 	/**
 	 * 鍒嗛〉鏌ヨ鎵�鏈�
-	 * @param pageNumber
-	 * @param pageSize
 	 * @return
 	 */
 	@ResponseBody
@@ -278,13 +274,14 @@
 //	            lines = new String(lines.getBytes(), "utf-8");
 //	            sb.append(lines);
 //	        }
+			logger.error("syncStocksFromSap---鍚屾搴撳瓨杩斿洖鏁版嵁" + sb.toString());
 	        //瑙f瀽json锛屾洿鏂板簱瀛�
 	        JSONObject json = JSONObject.fromObject(sb.toString());
 			String d = json.get("d").toString();
 			JSONObject jsonItem = JSONObject.fromObject(d);
 			String results = jsonItem.get("results").toString();
 			JSONArray array = JSONArray.fromObject(results);
-			
+
 			result = locDetailService.delLocDetailByLocNo(loc_no);
 			if(array.size()>0) {
 				for(int i=0;i<array.size();i++){
@@ -296,6 +293,7 @@
 					String altme = job.get("altme").toString();
 					
 					LocDetailBean locDetl = new LocDetailBean();
+//					logger.error("syncStocksFromSap---鎻掑叆鏁版嵁" + matnr+"-"+maktx+"-"+werks+"-"+gesme+"-"+altme);
 					locDetl.setLoc_no(loc_no);
 					locDetl.setMatnr(matnr);
 					locDetl.setLgnum("385");
@@ -306,15 +304,22 @@
 					locDetl.setWerks(werks);
 					locDetl.setAnfme(gesme);
 					locDetl.setAltme(altme);
+					if(barcode == null || "".equals(barcode)) {
+						LocationBean locationBean = locationService.queryLocationById(loc_no);
+						barcode = locationBean.getBarcode();
+					}
 					locDetl.setZpallet(barcode);
 					locDetl.setBname("");
 					result = locDetailService.insertLocDetail(locDetl);
+//					logger.error("syncStocksFromSap---鎻掑叆缁撴灉" + result);
+
 					if(result<=0) {
 						break;
 					}
 				}
 			}
 		} catch (Exception e) {
+			logger.error("sendSyncStockCmd Error----" + e.getMessage());
 			System.out.println(e.getMessage());
 		}
 		return result;

--
Gitblit v1.9.1