Selaa lähdekoodia

update 返回上个班的对象

qiangxuan 3 viikkoa sitten
vanhempi
sitoutus
351827de59

+ 2 - 2
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/OnDutyInfo.java

@@ -19,6 +19,6 @@ public class OnDutyInfo {
     private String standNoSize;
     // 自动手动定尺
     private String cutToLength;
-    // 上个班的id
-    private String lastShiftId;
+    // 上个班次信息
+    private BilletHotsendChangeShift lastBilletHotsendChangeShift;
 }

+ 1 - 1
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -1355,7 +1355,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                             .last("limit 1");
             BilletHotsendChangeShift billetHotsendChangeShiftLast = billetHotsendChangeShiftService.getOne(queryWrapperLast);
             if (billetHotsendChangeShiftLast != null){
-                onDutyInfo.setLastShiftId(billetHotsendChangeShiftLast.getId());
+                onDutyInfo.setBilletHotsendChangeShift(billetHotsendChangeShiftLast);
             }
         }else {
             // 根据铸机号、交班记录ID,获取交班记录中的班别、班次、创建时间