命名修改

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/entity/BilletHotsend.java

@@ -123,8 +123,8 @@ public class BilletHotsend implements Serializable {
     @ApiModelProperty(value = "'上若总支数'")
     private Integer rolloutshippNum;
 
-    @Excel(name = "副跨总支数", width = 15)
-    @ApiModelProperty(value = "'副跨总支数'")
+    @Excel(name = "付跨总支数", width = 15)
+    @ApiModelProperty(value = "'付跨总支数'")
     private Integer rollDeputyCrossNum;
 
     @Excel(name = "堆垛支数", width = 15)

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -1368,7 +1368,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollDeputyCross1.setUpdateTime(new Date());
 				rollDeputyCrossService.updateById(rollDeputyCross1);
 			}
-			// 保存副跨明细信息
+			// 保存付跨明细信息
 			List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = new ArrayList<>();
 			rollClubCommonList.forEach(x ->{
 				RollDeputyCrossDetails rollDeputyCrossDetails = new RollDeputyCrossDetails();

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/controller/BilletHotsendChangeShiftController.java

@@ -1117,7 +1117,7 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 		List<DestinationStatisticsDetails> statisticsDetailsGroup3List = new ArrayList<>(result3.values());
 		billetHotsendChangeShift.setRollClubShipDetails(JSON.toJSONString(statisticsDetailsGroup3List));
 
-		// 轧钢副跨明细
+		// 轧钢付跨明细
 		// 按照 size 分组，计算 nums 和 blankOutput 的总和，取每组第一条记录的 ccmNo
 		Map<String, DestinationStatisticsDetails> result4 = statisticsDetailsList3.stream()
 				.collect(Collectors.groupingBy(
@@ -1542,7 +1542,7 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 						}
 					}
 
-					if ("副跨".equals(storageBill.getDestination())) {
+					if ("付跨".equals(storageBill.getDestination())) {
 						LambdaQueryWrapper<RollDeputyCrossDetails> queryWrapper7 = new LambdaQueryWrapper<>();
 						queryWrapper7.eq(RollDeputyCrossDetails::getCcmNo, billetHotsendChangeShift1.getCcmNo())
 								.eq(RollDeputyCrossDetails::getStorageBillId, storageBill.getId());

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/entity/BilletHotsendChangeShift.java

@@ -173,7 +173,7 @@ public class BilletHotsendChangeShift implements Serializable {
     @ApiModelProperty(value = "轧钢上若明细")
     private String rollClubShipDetails;
 
-    @ApiModelProperty(value = "轧钢副跨明细")
+    @ApiModelProperty(value = "轧钢付跨明细")
     private String rollDeputyCrossDetails;
 
     // 班组定尺明细

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/entity/BilletShiftPerformance.java

@@ -129,6 +129,6 @@ public class BilletShiftPerformance {
     @ApiModelProperty(value = "轧钢高线明细")
     private List<DestinationStatisticsDetails> rollHeightDetailsList;
 
-    @ApiModelProperty(value = "轧钢副跨明细")
+    @ApiModelProperty(value = "轧钢付跨明细")
     private List<DestinationStatisticsDetails> rollDeputyCrossDetailsList;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/controller/RollDeputyCrossController.java

@@ -23,12 +23,12 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
- * @Description: 轧钢副跨
+ * @Description: 轧钢付跨
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0
  */
-@Api(tags="轧钢副跨")
+@Api(tags="轧钢付跨")
 @RestController
 @RequestMapping("/billetHotsendBase/rollDeputyCross")
 @Slf4j
@@ -45,8 +45,8 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "轧钢副跨-分页列表查询")
-	@ApiOperation(value="轧钢副跨-分页列表查询", notes="轧钢副跨-分页列表查询")
+	//@AutoLog(value = "轧钢付跨-分页列表查询")
+	@ApiOperation(value="轧钢付跨-分页列表查询", notes="轧钢付跨-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<RollDeputyCross>> queryPageList(RollDeputyCross rollDeputyCross,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -64,8 +64,8 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
 	 * @param rollDeputyCross
 	 * @return
 	 */
-	@AutoLog(value = "轧钢副跨-添加")
-	@ApiOperation(value="轧钢副跨-添加", notes="轧钢副跨-添加")
+	@AutoLog(value = "轧钢付跨-添加")
+	@ApiOperation(value="轧钢付跨-添加", notes="轧钢付跨-添加")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody RollDeputyCross rollDeputyCross) {
@@ -79,8 +79,8 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
 	 * @param rollDeputyCross
 	 * @return
 	 */
-	@AutoLog(value = "轧钢副跨-编辑")
-	@ApiOperation(value="轧钢副跨-编辑", notes="轧钢副跨-编辑")
+	@AutoLog(value = "轧钢付跨-编辑")
+	@ApiOperation(value="轧钢付跨-编辑", notes="轧钢付跨-编辑")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody RollDeputyCross rollDeputyCross) {
@@ -94,8 +94,8 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "轧钢副跨-通过id删除")
-	@ApiOperation(value="轧钢副跨-通过id删除", notes="轧钢副跨-通过id删除")
+	@AutoLog(value = "轧钢付跨-通过id删除")
+	@ApiOperation(value="轧钢付跨-通过id删除", notes="轧钢付跨-通过id删除")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -109,8 +109,8 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "轧钢副跨-批量删除")
-	@ApiOperation(value="轧钢副跨-批量删除", notes="轧钢副跨-批量删除")
+	@AutoLog(value = "轧钢付跨-批量删除")
+	@ApiOperation(value="轧钢付跨-批量删除", notes="轧钢付跨-批量删除")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -124,8 +124,8 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "轧钢副跨-通过id查询")
-	@ApiOperation(value="轧钢副跨-通过id查询", notes="轧钢副跨-通过id查询")
+	//@AutoLog(value = "轧钢付跨-通过id查询")
+	@ApiOperation(value="轧钢付跨-通过id查询", notes="轧钢付跨-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<RollDeputyCross> queryById(@RequestParam(name="id",required=true) String id) {
 		RollDeputyCross rollDeputyCross = rollDeputyCrossService.getById(id);
@@ -144,7 +144,7 @@ public class RollDeputyCrossController extends JeecgController<RollDeputyCross,
     @RequiresPermissions("rollDeputyCross:roll_deputy_cross:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, RollDeputyCross rollDeputyCross) {
-        return super.exportXls(request, rollDeputyCross, RollDeputyCross.class, "轧钢副跨");
+        return super.exportXls(request, rollDeputyCross, RollDeputyCross.class, "轧钢付跨");
     }
 
     /**

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/controller/RollDeputyCrossDetailsController.java

@@ -23,12 +23,12 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
- * @Description: 副跨明细
+ * @Description: 付跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0
  */
-@Api(tags="副跨明细")
+@Api(tags="付跨明细")
 @RestController
 @RequestMapping("/billetHotsendBase/rollDeputyCrossDetails")
 @Slf4j
@@ -45,8 +45,8 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "副跨明细-分页列表查询")
-	@ApiOperation(value="副跨明细-分页列表查询", notes="副跨明细-分页列表查询")
+	//@AutoLog(value = "付跨明细-分页列表查询")
+	@ApiOperation(value="付跨明细-分页列表查询", notes="付跨明细-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<RollDeputyCrossDetails>> queryPageList(RollDeputyCrossDetails rollDeputyCrossDetails,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -64,8 +64,8 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
 	 * @param rollDeputyCrossDetails
 	 * @return
 	 */
-	@AutoLog(value = "副跨明细-添加")
-	@ApiOperation(value="副跨明细-添加", notes="副跨明细-添加")
+	@AutoLog(value = "付跨明细-添加")
+	@ApiOperation(value="付跨明细-添加", notes="付跨明细-添加")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross_details:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody RollDeputyCrossDetails rollDeputyCrossDetails) {
@@ -79,8 +79,8 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
 	 * @param rollDeputyCrossDetails
 	 * @return
 	 */
-	@AutoLog(value = "副跨明细-编辑")
-	@ApiOperation(value="副跨明细-编辑", notes="副跨明细-编辑")
+	@AutoLog(value = "付跨明细-编辑")
+	@ApiOperation(value="付跨明细-编辑", notes="付跨明细-编辑")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross_details:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody RollDeputyCrossDetails rollDeputyCrossDetails) {
@@ -94,8 +94,8 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "副跨明细-通过id删除")
-	@ApiOperation(value="副跨明细-通过id删除", notes="副跨明细-通过id删除")
+	@AutoLog(value = "付跨明细-通过id删除")
+	@ApiOperation(value="付跨明细-通过id删除", notes="付跨明细-通过id删除")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross_details:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -109,8 +109,8 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "副跨明细-批量删除")
-	@ApiOperation(value="副跨明细-批量删除", notes="副跨明细-批量删除")
+	@AutoLog(value = "付跨明细-批量删除")
+	@ApiOperation(value="付跨明细-批量删除", notes="付跨明细-批量删除")
 	@RequiresPermissions("rollDeputyCross:roll_deputy_cross_details:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -124,8 +124,8 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "副跨明细-通过id查询")
-	@ApiOperation(value="副跨明细-通过id查询", notes="副跨明细-通过id查询")
+	//@AutoLog(value = "付跨明细-通过id查询")
+	@ApiOperation(value="付跨明细-通过id查询", notes="付跨明细-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<RollDeputyCrossDetails> queryById(@RequestParam(name="id",required=true) String id) {
 		RollDeputyCrossDetails rollDeputyCrossDetails = rollDeputyCrossDetailsService.getById(id);
@@ -144,7 +144,7 @@ public class RollDeputyCrossDetailsController extends JeecgController<RollDeputy
     @RequiresPermissions("rollDeputyCross:roll_deputy_cross_details:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, RollDeputyCrossDetails rollDeputyCrossDetails) {
-        return super.exportXls(request, rollDeputyCrossDetails, RollDeputyCrossDetails.class, "副跨明细");
+        return super.exportXls(request, rollDeputyCrossDetails, RollDeputyCrossDetails.class, "付跨明细");
     }
 
     /**

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/entity/RollDeputyCross.java

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 轧钢副跨
+ * @Description: 轧钢付跨
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0
@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("roll_deputy_cross")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="roll_deputy_cross对象", description="轧钢副跨")
+@ApiModel(value="roll_deputy_cross对象", description="轧钢付跨")
 public class RollDeputyCross implements Serializable {
     private static final long serialVersionUID = 1L;
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/entity/RollDeputyCrossDetails.java

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 副跨明细
+ * @Description: 付跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0
@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("roll_deputy_cross_details")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="roll_deputy_cross_details对象", description="副跨明细")
+@ApiModel(value="roll_deputy_cross_details对象", description="付跨明细")
 public class RollDeputyCrossDetails implements Serializable {
     private static final long serialVersionUID = 1L;
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/mapper/RollDeputyCrossDetailsMapper.java

@@ -4,7 +4,7 @@ import org.jeecg.modules.billet.rollDeputyCross.entity.RollDeputyCrossDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 副跨明细
+ * @Description: 付跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/mapper/RollDeputyCrossMapper.java

@@ -4,7 +4,7 @@ import org.jeecg.modules.billet.rollDeputyCross.entity.RollDeputyCross;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 轧钢副跨
+ * @Description: 轧钢付跨
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/service/IRollDeputyCrossDetailsService.java

@@ -4,7 +4,7 @@ import org.jeecg.modules.billet.rollDeputyCross.entity.RollDeputyCrossDetails;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 副跨明细
+ * @Description: 付跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/service/IRollDeputyCrossService.java

@@ -4,7 +4,7 @@ import org.jeecg.modules.billet.rollDeputyCross.entity.RollDeputyCross;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 轧钢副跨
+ * @Description: 轧钢付跨
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/service/impl/RollDeputyCrossDetailsServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 副跨明细
+ * @Description: 付跨明细
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/service/impl/RollDeputyCrossServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 轧钢副跨
+ * @Description: 轧钢付跨
  * @Author: jeecg-boot
  * @Date:   2025-06-04
  * @Version: V1.0

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/vue3/RollDeputyCrossDetailsList.vue

@@ -51,7 +51,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '副跨明细',
+           title: '付跨明细',
            api: list,
            columns,
            canResize:false,
@@ -71,7 +71,7 @@
             },
       },
        exportConfig: {
-            name:"副跨明细",
+            name:"付跨明细",
             url: getExportUrl,
           },
           importConfig: {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/vue3/RollDeputyCrossDetails_menu_insert.sql

@@ -3,24 +3,24 @@
 
 
 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2025060401236390540', NULL, '副跨明细', '/rollDeputyCross/rollDeputyCrossDetailsList', 'rollDeputyCross/RollDeputyCrossDetailsList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0);
+VALUES ('2025060401236390540', NULL, '付跨明细', '/rollDeputyCross/rollDeputyCrossDetailsList', 'rollDeputyCross/RollDeputyCrossDetailsList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0);
 
 -- 权限控制sql
 -- 新增
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401236390541', '2025060401236390540', '添加副跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401236390541', '2025060401236390540', '添加付跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
 -- 编辑
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401236390542', '2025060401236390540', '编辑副跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401236390542', '2025060401236390540', '编辑付跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
 -- 删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401236390543', '2025060401236390540', '删除副跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401236390543', '2025060401236390540', '删除付跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
 -- 批量删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401236390544', '2025060401236390540', '批量删除副跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401236390544', '2025060401236390540', '批量删除付跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
 -- 导出excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401236390545', '2025060401236390540', '导出excel_副跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401236390545', '2025060401236390540', '导出excel_付跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
 -- 导入excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401236390546', '2025060401236390540', '导入excel_副跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401236390546', '2025060401236390540', '导入excel_付跨明细', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross_details:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:54', NULL, NULL, 0, 0, '1', 0);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/vue3/RollDeputyCrossList.vue

@@ -51,7 +51,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '轧钢副跨',
+           title: '轧钢付跨',
            api: list,
            columns,
            canResize:false,
@@ -71,7 +71,7 @@
             },
       },
        exportConfig: {
-            name:"轧钢副跨",
+            name:"轧钢付跨",
             url: getExportUrl,
           },
           importConfig: {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollDeputyCross/vue3/RollDeputyCross_menu_insert.sql

@@ -3,24 +3,24 @@
 
 
 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2025060401234310440', NULL, '轧钢副跨', '/rollDeputyCross/rollDeputyCrossList', 'rollDeputyCross/RollDeputyCrossList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0);
+VALUES ('2025060401234310440', NULL, '轧钢付跨', '/rollDeputyCross/rollDeputyCrossList', 'rollDeputyCross/RollDeputyCrossList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0);
 
 -- 权限控制sql
 -- 新增
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401234310441', '2025060401234310440', '添加轧钢副跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401234310441', '2025060401234310440', '添加轧钢付跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
 -- 编辑
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401234310442', '2025060401234310440', '编辑轧钢副跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401234310442', '2025060401234310440', '编辑轧钢付跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
 -- 删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401234310443', '2025060401234310440', '删除轧钢副跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401234310443', '2025060401234310440', '删除轧钢付跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
 -- 批量删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401234310444', '2025060401234310440', '批量删除轧钢副跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401234310444', '2025060401234310440', '批量删除轧钢付跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
 -- 导出excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401234310445', '2025060401234310440', '导出excel_轧钢副跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401234310445', '2025060401234310440', '导出excel_轧钢付跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
 -- 导入excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2025060401234310446', '2025060401234310440', '导入excel_轧钢副跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2025060401234310446', '2025060401234310440', '导入excel_轧钢付跨', NULL, NULL, 0, NULL, NULL, 2, 'rollDeputyCross:roll_deputy_cross:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-06-04 13:23:44', NULL, NULL, 0, 0, '1', 0);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -593,7 +593,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                     RollDeputyCross rollDeputyCross1 = rollDeputyCrossService.getOne(queryWrapper1);
                     RollDeputyCross rollDeputyCross = new RollDeputyCross();
                     if (oConvertUtils.isEmpty(rollDeputyCross1)) {
-                        // 堆垛保存发车时 目的地为为副跨 保存副跨信息
+                        // 堆垛保存发车时 目的地为为付跨 保存付跨信息
                         rollDeputyCross.setId(String.valueOf(IdWorker.getId()));
                         rollDeputyCross.setCcmNo(y.getCcmNo().toString());
                         rollDeputyCross.setHeatNo(y.getHeatNo());
@@ -609,7 +609,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         rollDeputyCross.setCreateTime(new Date());
                         rollDeputyCrossService.save(rollDeputyCross);
                     } else {
-                        // 堆垛保存发车时 目的地为为副跨 更新副跨信息
+                        // 堆垛保存发车时 目的地为为付跨 更新付跨信息
                         rollDeputyCross1.setAmountTotal(rollDeputyCross1.getAmountTotal() + 1);// 总支数
                         rollDeputyCross1.setBlankOutput(rollDeputyCross1.getBlankOutput() + y.getBilletWeight());
                         rollDeputyCross1.setUpdateTime(new Date());
@@ -887,8 +887,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 BigDecimal bd = BigDecimal.valueOf(totalBlankOutputs).setScale(4, BigDecimal.ROUND_HALF_UP);
                 storageCarLog.setFixedWeight(bd.doubleValue());// 定重
             }
-        }else if ("副跨".equals(storageBillInfo.getDestination())) {
-            // 根据装运单ID，查询副跨明细表
+        }else if ("付跨".equals(storageBillInfo.getDestination())) {
+            // 根据装运单ID，查询付跨明细表
             LambdaQueryWrapper<RollDeputyCrossDetails> queryWrapperRCD = new LambdaQueryWrapper();
             queryWrapperRCD.eq(RollDeputyCrossDetails::getStorageBillId, storageBillInfo.getId());
             List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = rollDeputyCrossDetailsService.list(queryWrapperRCD);

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

@@ -679,7 +679,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 					rollOutShipp.setBlankOutput(Math.max(0, rollOutShipp.getBlankOutput() - sumBlankOutput));
 					rollOutShippService.updateById(rollOutShipp);
 				}
-			}else if ("副跨".equals(storageBillVo.getDestination())) {
+			}else if ("付跨".equals(storageBillVo.getDestination())) {
 				List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = rollDeputyCrossDetailsService.list(new LambdaQueryWrapper<RollDeputyCrossDetails>()
 						.eq(RollDeputyCrossDetails::getStorageBillId, storageBillVo.getId())
 						.eq(RollDeputyCrossDetails::getCcmNo, storageBillVo.getCcmNo())
@@ -829,7 +829,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			case "上若":
 				billetHotsend.setRolloutshippNum(Math.max(0, billetHotsend.getRolloutshippNum() - sumAmountTotal));
 				break;
-			case "副跨":
+			case "付跨":
 				billetHotsend.setRollDeputyCrossNum(Math.max(0, billetHotsend.getRollDeputyCrossNum() - sumAmountTotal));
 				break;
 		}

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

@@ -1402,7 +1402,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         }
 
         /**
-         * 保存副跨信息
+         * 保存付跨信息
          */
         if ("roll_deputy_cross".equals(billetHotsendDetailsVo.getBelongTable())){
             RollDeputyCross rollDeputyCross = new RollDeputyCross();
@@ -1431,7 +1431,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 rollDeputyCross.setUpdateTime(new Date());
                 rollDeputyCrossService.updateById(rollDeputyCross);
             }
-            // 保存副跨明细信息
+            // 保存付跨明细信息
             List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = new ArrayList<>();
             rollClubCommonList.forEach(x ->{
                 RollDeputyCrossDetails rollDeputyCrossDetails = new RollDeputyCrossDetails();
@@ -1764,8 +1764,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     onDutyStorageBillInfo.setBlankOutput(blankOutputSum);
                 }
             }
-            if ("副跨".equals(storageBill.getDestination())){
-                // 根据装运单ID查询副跨明细表，并计算出坯量
+            if ("付跨".equals(storageBill.getDestination())){
+                // 根据装运单ID查询付跨明细表，并计算出坯量
                 LambdaQueryWrapper<RollDeputyCrossDetails> queryWrapper4 = new LambdaQueryWrapper<>();
                 queryWrapper4.eq(RollDeputyCrossDetails::getCcmNo, ccmNo).eq(RollDeputyCrossDetails::getStorageBillId, storageBill.getId());
                 List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = rollDeputyCrossDetailsService.list(queryWrapper4);
@@ -1930,7 +1930,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 }
             }
 
-            if ("副跨".equals(storageBill.getDestination())) {
+            if ("付跨".equals(storageBill.getDestination())) {
                 LambdaQueryWrapper<RollDeputyCrossDetails> queryWrapper4 = new LambdaQueryWrapper<>();
                 queryWrapper4.eq(RollDeputyCrossDetails::getCcmNo, ccmNo).eq(RollDeputyCrossDetails::getStorageBillId, storageBill.getId());
                 List<RollDeputyCrossDetails> rollDeputyCrossDetailsList = rollDeputyCrossDetailsService.list(queryWrapper4);
@@ -2549,7 +2549,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         summaryList.addAll(result5);
 
-        // 根据铸机号、班组、班别、交班的创建时间，查询副跨符合条件的信息
+        // 根据铸机号、班组、班别、交班的创建时间，查询付跨符合条件的信息
         LambdaQueryWrapper<RollDeputyCrossDetails> queryWrapper6 = new LambdaQueryWrapper<>();
         queryWrapper6.eq(RollDeputyCrossDetails::getCcmNo, ccmNo)
                 .eq(RollDeputyCrossDetails::getShift, shift)