Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-java

# Conflicts:
#	zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -397,10 +397,19 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				 return Result.OK(Collections.emptyList());
 			 }
 		 }
+
+		 Date startTime = billetHotsendChangeShift.getCreateTime();
+		 Date endTime = billetHotsendChangeShift.getChangeShiftTime() != null
+				 ? billetHotsendChangeShift.getChangeShiftTime()
+				 : new Date();
+
 		 QueryWrapper<BilletOriginalProductRecord> queryWrapperB = new QueryWrapper<>();
 		 queryWrapperB.eq("ccm_no", queryDTO.getCcmNo())
 				 .eq("shift", billetHotsendChangeShift.getShift())
-				 .eq("shift_group", billetHotsendChangeShift.getShiftGroup());
+				 .eq("shift_group", billetHotsendChangeShift.getShiftGroup())
+				 .ge("create_time", startTime)   // createTime >= 班次开始时间
+				 .le("create_time", endTime)     // createTime <= 班次交接时间（或当前时间）
+				 .orderByAsc("create_time");
 
 		 List<BilletOriginalProductRecord> records = billetOriginalProductRecordService.list(queryWrapperB);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -308,7 +308,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		for (StorageBill bill : records) {
 			StorageBillPrint print = latestPrints.get(bill.getId());
 			if (print != null) {
-				bill.setOutTime(print.getArrivalTime());
 				bill.setDestination(print.getDestination());
 				bill.setAmountTotal(print.getAmountTotal());
 				bill.setSize(print.getSize());
@@ -583,6 +582,12 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 	@Transactional(rollbackFor = Exception.class)
 	public Result<String> edit(@RequestBody StorageBill storageBill) {
 		StorageBill old = storageBillService.getById(storageBill.getId());
+		// 新增判断逻辑：除车位号为 2 外，禁止修改 ccmNo
+		if (storageBill.getPositionNum() != null
+				&& storageBill.getPositionNum() != 2
+				&& !Objects.equals(storageBill.getCcmNo(), old.getCcmNo())) {
+			return Result.error("当前车位号不是 2，不能修改铸机号！");
+		}
 		int originalAmountTotal = old.getAmountTotal();
 		if("1024".equals(old.getTypeConfigId()) && oConvertUtils.isNotEmpty(storageBill.getDestination())){
 			try {