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

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/controller/RollClubThreeDetailsController.java

@@ -287,6 +287,18 @@ public class RollClubThreeDetailsController extends JeecgController<RollClubThre
             if (oConvertUtils.isNotEmpty(storageBillPrint.getLicensePlate())) {
                 queryWrapper.like("license_plate", storageBillPrint.getLicensePlate());
             }
+            // 定尺查询
+            if (oConvertUtils.isNotEmpty(storageBillPrint.getSize())) {
+                queryWrapper.like("size", storageBillPrint.getSize());
+            }
+            // 热坯/冷坯查询
+            if (oConvertUtils.isNotEmpty(storageBillPrint.getBtype())) {
+                queryWrapper.eq("btype", storageBillPrint.getBtype());
+            }
+            // 牌号查询
+            if (oConvertUtils.isNotEmpty(storageBillPrint.getBrandNum())) {
+                queryWrapper.eq("brand_num", storageBillPrint.getBrandNum());
+            }
             // 根据到站时间排序
             queryWrapper.orderByDesc("arrival_time");
             List<StorageBillPrint> exportList = storageBillPrintService.list(queryWrapper);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/controller/RollOutShippDetailsController.java

@@ -283,6 +283,18 @@ public class RollOutShippDetailsController extends JeecgController<RollOutShippD
 			if (oConvertUtils.isNotEmpty(storageBillPrint.getLicensePlate())) {
 				queryWrapper.like("license_plate", storageBillPrint.getLicensePlate());
 			}
+			// 定尺查询
+			if (oConvertUtils.isNotEmpty(storageBillPrint.getSize())) {
+				queryWrapper.like("size", storageBillPrint.getSize());
+			}
+			// 热坯/冷坯查询
+			if (oConvertUtils.isNotEmpty(storageBillPrint.getBtype())) {
+				queryWrapper.eq("btype", storageBillPrint.getBtype());
+			}
+			// 牌号查询
+			if (oConvertUtils.isNotEmpty(storageBillPrint.getBrandNum())) {
+				queryWrapper.eq("brand_num", storageBillPrint.getBrandNum());
+			}
 			// 根据到站时间排序
 			queryWrapper.orderByDesc("arrival_time");
 			List<StorageBillPrint> exportList = storageBillPrintService.list(queryWrapper);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/carUnit/service/impl/CarUnitServiceImpl.java

@@ -2567,7 +2567,17 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
         }
         row.setSpec(detail.getSpec());
         String btype = Optional.ofNullable(detail.getBtype()).orElse("");
-        row.setBtype("0".equals(btype) ? "热坯" : "凉坯");
+        switch (btype) {
+            case "0":
+                row.setBtype("热坯");
+                break;
+            case "1":
+                row.setBtype("凉坯");
+                break;
+            default:
+                row.setBtype("");
+                break;
+        }
 
         row.setBrand(getBrandNum(detail.getBrandNum()));