From 95db3e96a9465f137fdf16540e0c5985752894c2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java b/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java
index f965542..5c39505 100644
--- a/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java
+++ b/CacheVerticalGlassModule/src/main/java/com/mes/service/BigStorageCageService.java
@@ -12,37 +12,37 @@
// private BigStorageCageMapper bigStorageCageMapper;
- // // 鑾峰彇鐜荤拑瀛樻斁鏍煎瓙
- // public BigStorageCageDetails FeedGlass(BigStorageCageDetails bigStorageCageDetails) {
- // //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
- // BigStorageCageDetails LayoutSlotInfo=bigStorageCageMapper.SelectTemperingFeedSlot(bigStorageCageDetails);
- // //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
- // if (LayoutSlotInfo!=null) {
- // //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
- // bigStorageCageDetails.setSlot(LayoutSlotInfo.getSlot());
- // }else{
- // //鑾峰彇涓嶅埌鏃讹細
+ // 鑾峰彇鐜荤拑瀛樻斁鏍煎瓙
+ public BigStorageCageDetails FeedGlass(BigStorageCageDetails bigStorageCageDetails) {
+ //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
+ BigStorageCageDetails LayoutSlotInfo=bigStorageCageMapper.SelectTemperingFeedSlot(bigStorageCageDetails);
+ //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
+ if (LayoutSlotInfo!=null) {
+ //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
+ bigStorageCageDetails.setSlot(LayoutSlotInfo.getSlot());
+ }else{
+ //鑾峰彇涓嶅埌鏃讹細
- // //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
- // BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
- // bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
- // //鑾峰彇鍏朵粬绗兼牸瀛�
+ //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
+ BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
+ bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+ //鑾峰彇鍏朵粬绗兼牸瀛�-
- // //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
+ //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
- // }
+ }
- // UpdateRemainWidth(bigStorageCageDetails.getSlot());
- // return bigStorageCageDetails;
- // }
+ UpdateRemainWidth(bigStorageCageDetails.getSlot());
+ return bigStorageCageDetails;
+ }
- // //淇敼鏍煎瓙鍓╀綑瀹藉害
- // private void UpdateRemainWidth(int Slot){
- // //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ private void UpdateRemainWidth(int Slot){
+ //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
- // //淇敼鏍煎瓙鍓╀綑瀹藉害
- // BigStorageCageMapper.UpdateRemainWidth(Slot);
- // }
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ BigStorageCageMapper.UpdateRemainWidth(Slot);
+ }
}
--
Gitblit v1.8.0