update

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/controller/BilletRulerConfigController.java

@@ -0,0 +1,163 @@
+package org.jeecg.modules.actualControl.billetActual.billetActual.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
+import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletRulerConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 钢坯定尺配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-30
+ * @Version: V1.0
+ */
+@Api(tags="钢坯定尺配置表")
+@RestController
+@RequestMapping("/billetRuler/billetRulerConfig")
+@Slf4j
+public class BilletRulerConfigController extends JeecgController<BilletRulerConfig, IBilletRulerConfigService> {
+
+	@Autowired
+	private IBilletRulerConfigService billetRulerConfigService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param billetRulerConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯定尺配置表-分页列表查询")
+	@ApiOperation(value="钢坯定尺配置表-分页列表查询", notes="钢坯定尺配置表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BilletRulerConfig>> queryPageList(BilletRulerConfig billetRulerConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BilletRulerConfig> queryWrapper = QueryGenerator.initQueryWrapper(billetRulerConfig, req.getParameterMap());
+		Page<BilletRulerConfig> page = new Page<BilletRulerConfig>(pageNo, pageSize);
+		IPage<BilletRulerConfig> pageList = billetRulerConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param billetRulerConfig
+	 * @return
+	 */
+	@AutoLog(value = "钢坯定尺配置表-添加")
+	@ApiOperation(value="钢坯定尺配置表-添加", notes="钢坯定尺配置表-添加")
+	@RequiresPermissions("billetRulerConfig:billet_ruler_config:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BilletRulerConfig billetRulerConfig) {
+		billetRulerConfigService.save(billetRulerConfig);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param billetRulerConfig
+	 * @return
+	 */
+	@AutoLog(value = "钢坯定尺配置表-编辑")
+	@ApiOperation(value="钢坯定尺配置表-编辑", notes="钢坯定尺配置表-编辑")
+	@RequiresPermissions("billetRulerConfig:billet_ruler_config:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BilletRulerConfig billetRulerConfig) {
+		billetRulerConfigService.updateById(billetRulerConfig);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "钢坯定尺配置表-通过id删除")
+	@ApiOperation(value="钢坯定尺配置表-通过id删除", notes="钢坯定尺配置表-通过id删除")
+	@RequiresPermissions("billetRulerConfig:billet_ruler_config:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		billetRulerConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "钢坯定尺配置表-批量删除")
+	@ApiOperation(value="钢坯定尺配置表-批量删除", notes="钢坯定尺配置表-批量删除")
+	@RequiresPermissions("billetRulerConfig:billet_ruler_config:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.billetRulerConfigService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "钢坯定尺配置表-通过id查询")
+	@ApiOperation(value="钢坯定尺配置表-通过id查询", notes="钢坯定尺配置表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BilletRulerConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		BilletRulerConfig billetRulerConfig = billetRulerConfigService.getById(id);
+		if(billetRulerConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(billetRulerConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param billetRulerConfig
+    */
+    @RequiresPermissions("billetRulerConfig:billet_ruler_config:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BilletRulerConfig billetRulerConfig) {
+        return super.exportXls(request, billetRulerConfig, BilletRulerConfig.class, "钢坯定尺配置表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("billetRulerConfig:billet_ruler_config:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BilletRulerConfig.class);
+    }
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/entity/BilletBasicInfo.java

@@ -64,7 +64,7 @@ public class BilletBasicInfo implements Serializable {
     /**拉速*/
     @Excel(name = "拉速", width = 15)
     @ApiModelProperty(value = "拉速",required = true)
-    private String castingSpeed ;
+    private Double castingSpeed;
     /**钢包号*/
     @Excel(name = "钢包号", width = 15)
     @ApiModelProperty(value = "钢包号",required = true)
@@ -104,7 +104,7 @@ public class BilletBasicInfo implements Serializable {
 	/**定重*/
 	@Excel(name = "定重", width = 15)
     @ApiModelProperty(value = "定重",required = true)
-    private Integer weight;
+    private Double weight;
 	/**坯号*/
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号",required = true)
@@ -155,4 +155,9 @@ public class BilletBasicInfo implements Serializable {
     @Dict(dicCode = "lg_bb")
     @ApiModelProperty(value = "班别")
     private String shift;
+
+    /**坯重*/
+    @Excel(name = "坯重", width = 15)
+    @ApiModelProperty(value = "坯重",required = true)
+    private Double billetWeight;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/entity/BilletRulerConfig.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.actualControl.billetActual.billetActual.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 钢坯定尺配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("billet_ruler_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="billet_ruler_config对象", description="钢坯定尺配置表")
+public class BilletRulerConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**规格*/
+	@Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
+    private String spec;
+	/**定尺*/
+	@Excel(name = "定尺", width = 15)
+    @ApiModelProperty(value = "定尺")
+    private Integer length;
+	/**理论重量*/
+	@Excel(name = "理论重量", width = 15)
+    @ApiModelProperty(value = "理论重量")
+    private Double weight;
+    /**钢种*/
+    @Excel(name = "钢种", width = 15)
+    @ApiModelProperty(value = "钢种",required = true)
+    private String grade;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/mapper/BilletRulerConfigMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.actualControl.billetActual.billetActual.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
+
+/**
+ * @Description: 钢坯定尺配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-30
+ * @Version: V1.0
+ */
+public interface BilletRulerConfigMapper extends BaseMapper<BilletRulerConfig> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/mapper/xml/BilletRulerConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.actualControl.billetActual.billetActual.mapper.BilletRulerConfigMapper">
+
+</mapper>

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/IBilletRulerConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.actualControl.billetActual.billetActual.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
+
+/**
+ * @Description: 钢坯定尺配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-30
+ * @Version: V1.0
+ */
+public interface IBilletRulerConfigService extends IService<BilletRulerConfig> {
+
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/impl/BilletRulerConfigServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.actualControl.billetActual.billetActual.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
+import org.jeecg.modules.actualControl.billetActual.billetActual.mapper.BilletRulerConfigMapper;
+import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletRulerConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 钢坯定尺配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-30
+ * @Version: V1.0
+ */
+@Service
+public class BilletRulerConfigServiceImpl extends ServiceImpl<BilletRulerConfigMapper, BilletRulerConfig> implements IBilletRulerConfigService {
+
+}

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

@@ -2,7 +2,6 @@ package org.jeecg.modules.billet.billetHotsendChangeShift.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -127,12 +126,7 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 	@RequiresPermissions("billetHotsendChangeShift:billet_hotsend_change_shift:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody BilletHotsendChangeShift billetHotsendChangeShift) {
-		LambdaUpdateWrapper<BilletHotsendChangeShift> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-		lambdaUpdateWrapper.eq(BilletHotsendChangeShift::getCcmNo, billetHotsendChangeShift.getCcmNo())
-				.eq(BilletHotsendChangeShift::getHeatNo, billetHotsendChangeShift.getHeatNo())
-				.eq(BilletHotsendChangeShift::getShiftGroup, billetHotsendChangeShift.getShiftGroup())
-				.eq(BilletHotsendChangeShift::getShift, billetHotsendChangeShift.getShift());
-		billetHotsendChangeShiftService.update(billetHotsendChangeShift, lambdaUpdateWrapper);
+		billetHotsendChangeShiftService.updateById(billetHotsendChangeShift);
 		return Result.OK("编辑成功!");
 	}
 	

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

@@ -604,6 +604,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         StorageBill storageBill = loadingParams.getStorageBill();
         storageBill.setAmountTotal(stackingAndLoadingVehiclesList.size() * 4);
         storageBill.setDestination(loadingParams.getDestination());
+        storageBill.setTypeConfigId(loadingParams.getDestinationId());
         storageBillService.updateById(storageBill);
     }
 
@@ -733,7 +734,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         });
         billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
         // 6 更新装运单 storage_bill 新增储运信息
-        storageBill.setTypeConfigId(loadingParams.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
+        storageBill.setTypeConfigId(loadingParams.getDestinationId()); // 钢坯配置类型ID
         storageBill.setDestination(loadingParams.getDestination());// 目的地
         storageBill.setAmountTotal(storageBill.getAmountTotal() + stackingAndLoadingVehiclesList.size() * 4);
         storageBill.setOutTime(new Date());