Merge branch 'dgq_06/tgs_kb'

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

@@ -892,17 +892,18 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 																			   @RequestParam(name="heatNo", required = false, defaultValue = "") String heatNo,
 																			   @RequestParam(name = "size", required = false, defaultValue = "") String size,
 																			   @RequestParam(name = "btype", required = false, defaultValue = "") String btype,
+																			   @RequestParam(name = "brandNum", required = false, defaultValue = "") String brandNum,
 																			   @RequestParam(name="licensePlate", required = false, defaultValue = "") String licensePlate) {
 		 List<BilletDetailsInfo> billetDetailsInfoList = new ArrayList<>();
 		 if (queryType.equals("1")){
 			 // 查询棒一，指定日期的统计明细
 			 billetDetailsInfoList = queryRollClubOneStatistics(ccmNo,  changeShiftId, queryDate, heatNo, startTime, endTime);
 		 }else if(queryType.equals("2")){ // 查询棒二，指定班次的统计明细
-			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "棒二", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype);
+			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "棒二", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype, brandNum);
 		 }else if(queryType.equals("3")){  // 查询棒三，指定班次的统计明细
-			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "棒三", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype);
+			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "棒三", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype, brandNum);
 		 }else if(queryType.equals("4")){ // 查询上若，指定班次的统计明细
-			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "上若", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype);
+			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "上若", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype, brandNum);
 		 }
 		 return Result.OK(billetDetailsInfoList);
 	 }
@@ -1417,7 +1418,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 	  * @param queryDate
 	  * @return
 	  */
-	 private List<BilletDetailsInfo> querSstorageBillPrintStatistics(String ccmNo, String destination, String queryDate, String changeShiftId, String heatNo, String licensePlate, String startTimes, String endTimes, String sizes, String btype) {
+	 private List<BilletDetailsInfo> querSstorageBillPrintStatistics(String ccmNo, String destination, String queryDate, String changeShiftId, String heatNo, String licensePlate, String startTimes, String endTimes, String sizes, String btype, String brandNum) {
 		 List<BilletDetailsInfo> billetDetailsInfoList = new ArrayList<>();
 		 // 根据铸机号、开始时间、结束时间查询查询装运单打印表
 		 LambdaQueryWrapper<StorageBillPrint> queryWrapper = new LambdaQueryWrapper<>();
@@ -1468,6 +1469,10 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 if (oConvertUtils.isNotEmpty(btype)) {
 			 queryWrapper.eq(StorageBillPrint::getBtype, btype);
 		 }
+		 // 牌号
+		 if (oConvertUtils.isNotEmpty(brandNum)) {
+			 queryWrapper.eq(StorageBillPrint::getBrandNum, brandNum);
+		 }
 
 		 List<StorageBillPrint> storageBillPrintList = storageBillPrintService.list(queryWrapper);
 		 if (oConvertUtils.listIsEmpty(storageBillPrintList)) {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/dto/RollClubOneQueryDTO.java

@@ -46,6 +46,10 @@ public class RollClubOneQueryDTO {
      * 定尺
      */
     private String size;
+    /**
+     * 牌号
+     */
+    private String brandNum;
 
     /**
      * 班别

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

@@ -290,6 +290,11 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
         if (oConvertUtils.isNotEmpty(queryDTO.getSize())) {
             oneQueryWrapper.like(BilletOriginalProductRecord::getRollClubOneDetails, queryDTO.getSize());
         }
+
+        // 牌号
+        if (oConvertUtils.isNotEmpty(queryDTO.getBrandNum())) {
+            oneQueryWrapper.eq(BilletOriginalProductRecord::getGrade, queryDTO.getBrandNum());
+        }
         oneQueryWrapper.orderByAsc(BilletOriginalProductRecord::getCreateTime);
 
         List<BilletOriginalProductRecord> list = billetOriginalProductRecordService.list(oneQueryWrapper);

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

@@ -125,6 +125,7 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
                                                          @RequestParam(name = "heatNo", required = false, defaultValue = "") String heatNo,
                                                          @RequestParam(name = "size", required = false, defaultValue = "") String size,
                                                          @RequestParam(name = "btype", required = false, defaultValue = "") String btype,
+                                                         @RequestParam(name = "brandNum", required = false, defaultValue = "") String brandNum,
                                                          @RequestParam(name = "licensePlate", required = false, defaultValue = "") String licensePlate,
                                                          HttpServletRequest req) {
 //        QueryWrapper<StorageBillPrint> queryWrapper = QueryGenerator.initQueryWrapper(storageBillPrint, req.getParameterMap());
@@ -185,6 +186,10 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
         if (oConvertUtils.isNotEmpty(btype)) {
             queryWrapper.eq("btype", btype);
         }
+        // 牌号
+        if (oConvertUtils.isNotEmpty(brandNum)) {
+            queryWrapper.eq("brand_num", brandNum);
+        }
         // 根据到站时间排序
         queryWrapper.orderByDesc("arrival_time");
         IPage<StorageBillPrint> pageList = storageBillPrintService.page(page, queryWrapper);