diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/commit/domain/CheckCommitRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/check/commit/domain/CheckCommitRecord.java index e08091a..ef9134c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/commit/domain/CheckCommitRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/commit/domain/CheckCommitRecord.java @@ -31,18 +31,66 @@ public class CheckCommitRecord extends BaseEntity @Excel(name = "盘点数量") private String quantity; - /** 备用1 */ - @Excel(name = "备用1") + /** 单据子单id */ + @Excel(name = "单据子单id") private String spare1; - /** 备用2 */ - @Excel(name = "备用2") + /** 物料编码 */ + @Excel(name = "物料编码") private String spare2; - /** 备用3 */ - @Excel(name = "备用3") + /** 供应商 */ + @Excel(name = "供应商") private String spare3; + /** 来源 */ + @Excel(name = "来源") + private String spare4; + + /** 状态 */ + @Excel(name = "状态") + private String spare5; + + /** 套账 */ + @Excel(name = "套账") + private String spare6; + + /** 用途 */ + @Excel(name = "用途") + private String spare7; + + /** 台次 */ + @Excel(name = "台次") + private String spare8; + + /** 合同号 */ + @Excel(name = "合同号") + private String spare9; + + /** 件次 */ + @Excel(name = "件次") + private String spare10; + + /** 批次 */ + @Excel(name = "批次") + private String spare11; + + /** 价格 */ + @Excel(name = "价格") + private String spare12; + + /** 管理号 */ + @Excel(name = "管理号") + private String spare13; + + /** 质量 */ + @Excel(name = "质量") + private String spare14; + + /** 备用15 */ + @Excel(name = "备用15") + private String spare15; + public void setPdGuid(Long pdGuid) { this.pdGuid = pdGuid; @@ -113,16 +161,148 @@ public class CheckCommitRecord extends BaseEntity return spare3; } + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setSpare5(String spare5) + { + this.spare5 = spare5; + } + + public String getSpare5() + { + return spare5; + } + + public void setSpare6(String spare6) + { + this.spare6 = spare6; + } + + public String getSpare6() + { + return spare6; + } + + public void setSpare7(String spare7) + { + this.spare7 = spare7; + } + + public String getSpare7() + { + return spare7; + } + + public void setSpare8(String spare8) + { + this.spare8 = spare8; + } + + public String getSpare8() + { + return spare8; + } + + public void setSpare9(String spare9) + { + this.spare9 = spare9; + } + + public String getSpare9() + { + return spare9; + } + + public void setSpare10(String spare10) + { + this.spare10 = spare10; + } + + public String getSpare10() + { + return spare10; + } + + public void setSpare11(String spare11) + { + this.spare11 = spare11; + } + + public String getSpare11() + { + return spare11; + } + + public void setSpare12(String spare12) + { + this.spare12 = spare12; + } + + public String getSpare12() + { + return spare12; + } + + public void setSpare13(String spare13) + { + this.spare13 = spare13; + } + + public String getSpare13() + { + return spare13; + } + + public void setSpare14(String spare14) + { + this.spare14 = spare14; + } + + public String getSpare14() + { + return spare14; + } + + public void setSpare15(String spare15) + { + this.spare15 = spare15; + } + + public String getSpare15() + { + return spare15; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("pdGuid", getPdGuid()) - .append("trayCode", getTrayCode()) - .append("stockId", getStockId()) - .append("quantity", getQuantity()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .toString(); + .append("pdGuid", getPdGuid()) + .append("trayCode", getTrayCode()) + .append("stockId", getStockId()) + .append("quantity", getQuantity()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .append("spare6", getSpare6()) + .append("spare7", getSpare7()) + .append("spare8", getSpare8()) + .append("spare9", getSpare9()) + .append("spare10", getSpare10()) + .append("spare11", getSpare11()) + .append("spare12", getSpare12()) + .append("spare13", getSpare13()) + .append("spare14", getSpare14()) + .append("spare15", getSpare15()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index fe71977..40c1c65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -11,6 +11,8 @@ import com.ruoyi.check.DifferenceRecordFinish.domain.CheckDifferenceRecordFinish import com.ruoyi.check.DifferenceRecordFinish.service.ICheckDifferenceRecordFinishService; import com.ruoyi.check.difference.domain.CheckDifferenceRecord; import com.ruoyi.check.difference.service.ICheckDifferenceRecordService; +import com.ruoyi.check.differenceAdd.domain.CheckDifferenceRecordAddInfo; +import com.ruoyi.check.differenceAdd.service.ICheckDifferenceRecordAddInfoService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -48,6 +50,9 @@ public class CheckDifferenceRecordController extends BaseController { @Autowired private IBasCargoSpaceService basCargoSpaceService; + @Autowired + private ICheckDifferenceRecordAddInfoService checkDifferenceRecordAddInfoService; + /** * 查询盘点差异列表 */ @@ -159,10 +164,17 @@ public class CheckDifferenceRecordController extends BaseController { } else if ("2".equals(recordType)) { // 新增数据 // 检查物料ID是否存在 if (record.getProductId() == null || record.getProductId().trim().isEmpty()) { - log.error("物料ID不能为空"); - return AjaxResult.error(MessageUtils.message("error.message16")); + return AjaxResult.error("物料ID不能为空"); } + CheckDifferenceRecordAddInfo queryInfo = new CheckDifferenceRecordAddInfo(); + queryInfo.setSpare1(record.getCheckGuid()); + List checkDifferenceRecordAddInfos = checkDifferenceRecordAddInfoService.selectCheckDifferenceRecordAddInfoList(queryInfo); + if (checkDifferenceRecordAddInfos.isEmpty()) { + return AjaxResult.error("没有找到该新增数据信息"); + } + CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo = checkDifferenceRecordAddInfos.get(0); + //todo 创建新的库存记录 BasStock newStock = new BasStock(); // 先设置必要字段 @@ -178,12 +190,29 @@ public class CheckDifferenceRecordController extends BaseController { newStock.setInType(""); newStock.setOutQuantity("0"); newStock.setInDate(DateUtil.formatDateTime(DateUtil.date())); - // 初始化extraField对象 - ExtraField extraField = new ExtraField(); - extraField.setProductId(record.getProductId()); - // 物料名称和其他信息会通过关联查询自动填充 - newStock.setExtraField(extraField); - + //供应商 + newStock.setPhase(checkDifferenceRecordAddInfo.getSpare3()); + //来源地 + newStock.setSpare1(checkDifferenceRecordAddInfo.getSpare4()); + //周转 + newStock.setVoltage(checkDifferenceRecordAddInfo.getSpare5()); + //套账 + newStock.setSpare3(checkDifferenceRecordAddInfo.getSpare6()); + //用途 + newStock.setSpare4(checkDifferenceRecordAddInfo.getSpare7()); + //台次 + newStock.setSpare5(checkDifferenceRecordAddInfo.getSpare8()); + //合同 + newStock.setOrderId(checkDifferenceRecordAddInfo.getSpare9()); + //件次 + newStock.setPower(checkDifferenceRecordAddInfo.getSpare10()); + newStock.setLotNo(checkDifferenceRecordAddInfo.getSpare11()); + //入库价格 + newStock.setSpare6(checkDifferenceRecordAddInfo.getSpare12()); + //管理 + newStock.setDistribution(checkDifferenceRecordAddInfo.getSpare13()); + //质量等级 + newStock.setSpare8(checkDifferenceRecordAddInfo.getSpare14()); // 最后设置库存ID newStock.setStockId(basJobIdService.getJobId("KC")); basStockService.insertBasStock(newStock); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/controller/CheckDifferenceRecordAddInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/controller/CheckDifferenceRecordAddInfoController.java new file mode 100644 index 0000000..b9ee0a5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/controller/CheckDifferenceRecordAddInfoController.java @@ -0,0 +1,104 @@ +package com.ruoyi.check.differenceAdd.controller; + +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.check.differenceAdd.domain.CheckDifferenceRecordAddInfo; +import com.ruoyi.check.differenceAdd.service.ICheckDifferenceRecordAddInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 盘点新增附加字段Controller + * + * @author ruoyi + * @date 2025-11-04 + */ +@RestController +@RequestMapping("/check/differenceAdd") +public class CheckDifferenceRecordAddInfoController extends BaseController +{ + @Autowired + private ICheckDifferenceRecordAddInfoService checkDifferenceRecordAddInfoService; + + /** + * 查询盘点新增附加字段列表 + */ + @PreAuthorize("@ss.hasPermi('check:differenceAdd:list')") + @GetMapping("/list") + public TableDataInfo list(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + startPage(); + List list = checkDifferenceRecordAddInfoService.selectCheckDifferenceRecordAddInfoList(checkDifferenceRecordAddInfo); + return getDataTable(list); + } + + /** + * 导出盘点新增附加字段列表 + */ + @PreAuthorize("@ss.hasPermi('check:differenceAdd:export')") + @Log(title = "盘点新增附加字段", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + List list = checkDifferenceRecordAddInfoService.selectCheckDifferenceRecordAddInfoList(checkDifferenceRecordAddInfo); + ExcelUtil util = new ExcelUtil(CheckDifferenceRecordAddInfo.class); + util.exportExcel(response, list, "盘点新增附加字段数据"); + } + + /** + * 获取盘点新增附加字段详细信息 + */ + @PreAuthorize("@ss.hasPermi('check:differenceAdd:query')") + @GetMapping(value = "/{checkAddId}") + public AjaxResult getInfo(@PathVariable("checkAddId") String checkAddId) + { + return success(checkDifferenceRecordAddInfoService.selectCheckDifferenceRecordAddInfoByCheckAddId(checkAddId)); + } + + /** + * 新增盘点新增附加字段 + */ + @PreAuthorize("@ss.hasPermi('check:differenceAdd:add')") + @Log(title = "盘点新增附加字段", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + return toAjax(checkDifferenceRecordAddInfoService.insertCheckDifferenceRecordAddInfo(checkDifferenceRecordAddInfo)); + } + + /** + * 修改盘点新增附加字段 + */ + @PreAuthorize("@ss.hasPermi('check:differenceAdd:edit')") + @Log(title = "盘点新增附加字段", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + return toAjax(checkDifferenceRecordAddInfoService.updateCheckDifferenceRecordAddInfo(checkDifferenceRecordAddInfo)); + } + + /** + * 删除盘点新增附加字段 + */ + @PreAuthorize("@ss.hasPermi('check:differenceAdd:remove')") + @Log(title = "盘点新增附加字段", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkAddIds}") + public AjaxResult remove(@PathVariable String[] checkAddIds) + { + return toAjax(checkDifferenceRecordAddInfoService.deleteCheckDifferenceRecordAddInfoByCheckAddIds(checkAddIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/domain/CheckDifferenceRecordAddInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/domain/CheckDifferenceRecordAddInfo.java new file mode 100644 index 0000000..dd830ca --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/domain/CheckDifferenceRecordAddInfo.java @@ -0,0 +1,262 @@ +package com.ruoyi.check.differenceAdd.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 盘点新增附加字段对象 check_difference_record_add_info + * + * @author ruoyi + * @date 2025-11-04 + */ +public class CheckDifferenceRecordAddInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private String checkAddId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare2; + + /** 供应商 */ + @Excel(name = "供应商") + private String spare3; + + /** 来源 */ + @Excel(name = "来源") + private String spare4; + + /** 状态 */ + @Excel(name = "状态") + private String spare5; + + /** 套账 */ + @Excel(name = "套账") + private String spare6; + + /** 用途 */ + @Excel(name = "用途") + private String spare7; + + /** 台次 */ + @Excel(name = "台次") + private String spare8; + + /** 合同号 */ + @Excel(name = "合同号") + private String spare9; + + /** 件次 */ + @Excel(name = "件次") + private String spare10; + + /** 批次 */ + @Excel(name = "批次") + private String spare11; + + /** 价格 */ + @Excel(name = "价格") + private String spare12; + + /** 管理号 */ + @Excel(name = "管理号") + private String spare13; + + /** 质量 */ + @Excel(name = "质量") + private String spare14; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare15; + + public void setCheckAddId(String checkAddId) + { + this.checkAddId = checkAddId; + } + + public String getCheckAddId() + { + return checkAddId; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setSpare5(String spare5) + { + this.spare5 = spare5; + } + + public String getSpare5() + { + return spare5; + } + + public void setSpare6(String spare6) + { + this.spare6 = spare6; + } + + public String getSpare6() + { + return spare6; + } + + public void setSpare7(String spare7) + { + this.spare7 = spare7; + } + + public String getSpare7() + { + return spare7; + } + + public void setSpare8(String spare8) + { + this.spare8 = spare8; + } + + public String getSpare8() + { + return spare8; + } + + public void setSpare9(String spare9) + { + this.spare9 = spare9; + } + + public String getSpare9() + { + return spare9; + } + + public void setSpare10(String spare10) + { + this.spare10 = spare10; + } + + public String getSpare10() + { + return spare10; + } + + public void setSpare11(String spare11) + { + this.spare11 = spare11; + } + + public String getSpare11() + { + return spare11; + } + + public void setSpare12(String spare12) + { + this.spare12 = spare12; + } + + public String getSpare12() + { + return spare12; + } + + public void setSpare13(String spare13) + { + this.spare13 = spare13; + } + + public String getSpare13() + { + return spare13; + } + + public void setSpare14(String spare14) + { + this.spare14 = spare14; + } + + public String getSpare14() + { + return spare14; + } + + public void setSpare15(String spare15) + { + this.spare15 = spare15; + } + + public String getSpare15() + { + return spare15; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkAddId", getCheckAddId()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .append("spare6", getSpare6()) + .append("spare7", getSpare7()) + .append("spare8", getSpare8()) + .append("spare9", getSpare9()) + .append("spare10", getSpare10()) + .append("spare11", getSpare11()) + .append("spare12", getSpare12()) + .append("spare13", getSpare13()) + .append("spare14", getSpare14()) + .append("spare15", getSpare15()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/mapper/CheckDifferenceRecordAddInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/mapper/CheckDifferenceRecordAddInfoMapper.java new file mode 100644 index 0000000..50ac7f1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/mapper/CheckDifferenceRecordAddInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.check.differenceAdd.mapper; + +import java.util.List; +import com.ruoyi.check.differenceAdd.domain.CheckDifferenceRecordAddInfo; + +/** + * 盘点新增附加字段Mapper接口 + * + * @author ruoyi + * @date 2025-11-04 + */ +public interface CheckDifferenceRecordAddInfoMapper +{ + /** + * 查询盘点新增附加字段 + * + * @param checkAddId 盘点新增附加字段主键 + * @return 盘点新增附加字段 + */ + public CheckDifferenceRecordAddInfo selectCheckDifferenceRecordAddInfoByCheckAddId(String checkAddId); + + /** + * 查询盘点新增附加字段列表 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 盘点新增附加字段集合 + */ + public List selectCheckDifferenceRecordAddInfoList(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo); + + /** + * 新增盘点新增附加字段 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 结果 + */ + public int insertCheckDifferenceRecordAddInfo(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo); + + /** + * 修改盘点新增附加字段 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 结果 + */ + public int updateCheckDifferenceRecordAddInfo(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo); + + /** + * 删除盘点新增附加字段 + * + * @param checkAddId 盘点新增附加字段主键 + * @return 结果 + */ + public int deleteCheckDifferenceRecordAddInfoByCheckAddId(String checkAddId); + + /** + * 批量删除盘点新增附加字段 + * + * @param checkAddIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCheckDifferenceRecordAddInfoByCheckAddIds(String[] checkAddIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/ICheckDifferenceRecordAddInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/ICheckDifferenceRecordAddInfoService.java new file mode 100644 index 0000000..8b12de1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/ICheckDifferenceRecordAddInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.check.differenceAdd.service; + +import java.util.List; +import com.ruoyi.check.differenceAdd.domain.CheckDifferenceRecordAddInfo; + +/** + * 盘点新增附加字段Service接口 + * + * @author ruoyi + * @date 2025-11-04 + */ +public interface ICheckDifferenceRecordAddInfoService +{ + /** + * 查询盘点新增附加字段 + * + * @param checkAddId 盘点新增附加字段主键 + * @return 盘点新增附加字段 + */ + public CheckDifferenceRecordAddInfo selectCheckDifferenceRecordAddInfoByCheckAddId(String checkAddId); + + /** + * 查询盘点新增附加字段列表 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 盘点新增附加字段集合 + */ + public List selectCheckDifferenceRecordAddInfoList(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo); + + /** + * 新增盘点新增附加字段 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 结果 + */ + public int insertCheckDifferenceRecordAddInfo(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo); + + /** + * 修改盘点新增附加字段 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 结果 + */ + public int updateCheckDifferenceRecordAddInfo(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo); + + /** + * 批量删除盘点新增附加字段 + * + * @param checkAddIds 需要删除的盘点新增附加字段主键集合 + * @return 结果 + */ + public int deleteCheckDifferenceRecordAddInfoByCheckAddIds(String[] checkAddIds); + + /** + * 删除盘点新增附加字段信息 + * + * @param checkAddId 盘点新增附加字段主键 + * @return 结果 + */ + public int deleteCheckDifferenceRecordAddInfoByCheckAddId(String checkAddId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/impl/CheckDifferenceRecordAddInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/impl/CheckDifferenceRecordAddInfoServiceImpl.java new file mode 100644 index 0000000..ecb0717 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/impl/CheckDifferenceRecordAddInfoServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.check.differenceAdd.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.check.differenceAdd.mapper.CheckDifferenceRecordAddInfoMapper; +import com.ruoyi.check.differenceAdd.domain.CheckDifferenceRecordAddInfo; +import com.ruoyi.check.differenceAdd.service.ICheckDifferenceRecordAddInfoService; + +/** + * 盘点新增附加字段Service业务层处理 + * + * @author ruoyi + * @date 2025-11-04 + */ +@Service +public class CheckDifferenceRecordAddInfoServiceImpl implements ICheckDifferenceRecordAddInfoService +{ + @Autowired + private CheckDifferenceRecordAddInfoMapper checkDifferenceRecordAddInfoMapper; + + /** + * 查询盘点新增附加字段 + * + * @param checkAddId 盘点新增附加字段主键 + * @return 盘点新增附加字段 + */ + @Override + public CheckDifferenceRecordAddInfo selectCheckDifferenceRecordAddInfoByCheckAddId(String checkAddId) + { + return checkDifferenceRecordAddInfoMapper.selectCheckDifferenceRecordAddInfoByCheckAddId(checkAddId); + } + + /** + * 查询盘点新增附加字段列表 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 盘点新增附加字段 + */ + @Override + public List selectCheckDifferenceRecordAddInfoList(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + return checkDifferenceRecordAddInfoMapper.selectCheckDifferenceRecordAddInfoList(checkDifferenceRecordAddInfo); + } + + /** + * 新增盘点新增附加字段 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 结果 + */ + @Override + public int insertCheckDifferenceRecordAddInfo(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + return checkDifferenceRecordAddInfoMapper.insertCheckDifferenceRecordAddInfo(checkDifferenceRecordAddInfo); + } + + /** + * 修改盘点新增附加字段 + * + * @param checkDifferenceRecordAddInfo 盘点新增附加字段 + * @return 结果 + */ + @Override + public int updateCheckDifferenceRecordAddInfo(CheckDifferenceRecordAddInfo checkDifferenceRecordAddInfo) + { + return checkDifferenceRecordAddInfoMapper.updateCheckDifferenceRecordAddInfo(checkDifferenceRecordAddInfo); + } + + /** + * 批量删除盘点新增附加字段 + * + * @param checkAddIds 需要删除的盘点新增附加字段主键 + * @return 结果 + */ + @Override + public int deleteCheckDifferenceRecordAddInfoByCheckAddIds(String[] checkAddIds) + { + return checkDifferenceRecordAddInfoMapper.deleteCheckDifferenceRecordAddInfoByCheckAddIds(checkAddIds); + } + + /** + * 删除盘点新增附加字段信息 + * + * @param checkAddId 盘点新增附加字段主键 + * @return 结果 + */ + @Override + public int deleteCheckDifferenceRecordAddInfoByCheckAddId(String checkAddId) + { + return checkDifferenceRecordAddInfoMapper.deleteCheckDifferenceRecordAddInfoByCheckAddId(checkAddId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java index c5ca6cb..ba36232 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java @@ -93,15 +93,12 @@ public class MydoJobDetail extends BaseEntity private String stockinId; /** 垛型ID */ - @Excel(name = "垛型ID") private String stackingId; /** 出库口ID */ - @Excel(name = "出库口ID") private String exitId; - /** 生产日期 */ - @Excel(name = "生产日期") + @Excel(name = "金额") private String printDate; /** 客户ID */ @@ -111,44 +108,35 @@ public class MydoJobDetail extends BaseEntity /** 供应商ID */ @Excel(name = "供应商ID") private String supplierId; - @Excel(name = "供应商") private String supplierName; - /** 备用字段1 */ - @Excel(name = "型号") + @Excel(name = "来源地") private String spare1; - /** 备用字段2 */ - @Excel(name = "净重") + @Excel(name = "周转类型") private String spare2; - /** 备用字段3 */ - @Excel(name = "颜色") + @Excel(name = "套账") private String spare3; - - /** 备用字段4 */ - @Excel(name = "序列号") + @Excel(name = "用途") private String spare4; private String status; - @Excel(name = "拣选数量") private String pickQuantity; private ExtraField extraField; private String pickQuantityReal; private String pickBindQuantity; - @Excel(name = "电压") + @Excel(name = "台次") private String spare5; - @Excel(name = "功率") + @Excel(name = "合同号") private String spare6; - @Excel(name = "相位") + @Excel(name = "件次") private String spare7; - @Excel(name = "毛重") + @Excel(name = "质量等级") private String spare8; - @Excel(name = "分销") + @Excel(name = "管理号") private String spare9; - @Excel(name = "规格") private String spec; - @Excel(name = "机型") private String unit; private String trayCode; private String cargoNo; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 23e5e39..d480431 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -152,7 +152,18 @@ public class PdaServiceImp implements PdaService { checkCommitRecord.setStockId(mydoJobDetail.getStockId()); checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId()); checkCommitRecord.setSpare2(mydoJobDetail.getProductId()); - checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity()); + checkCommitRecord.setSpare3(mydoJobDetail.getSupplierId()); + checkCommitRecord.setSpare4(mydoJobDetail.getSpare1()); + checkCommitRecord.setSpare5(mydoJobDetail.getSpare2()); + checkCommitRecord.setSpare6(mydoJobDetail.getSpare3()); + checkCommitRecord.setSpare7(mydoJobDetail.getSpare4()); + checkCommitRecord.setSpare8(mydoJobDetail.getSpare5()); + checkCommitRecord.setSpare9(mydoJobDetail.getSpare6()); + checkCommitRecord.setSpare10(mydoJobDetail.getSpare7()); + checkCommitRecord.setSpare11(mydoJobDetail.getLotNo()); + checkCommitRecord.setSpare12(mydoJobDetail.getPrintDate()); + checkCommitRecord.setSpare13(mydoJobDetail.getSpare9()); + checkCommitRecord.setSpare14(mydoJobDetail.getSpare8()); checkCommitRecordService.insertCheckCommitRecord(checkCommitRecord); } diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml index 35ec7e1..31312b0 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,15 +12,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + - select pd_guid, tray_code, stock_id, quantity, spare1, spare2, spare3 from check_commit_record + select pd_guid, tray_code, stock_id, quantity, spare1, spare2, spare3, spare4, spare5, spare6, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15 from check_commit_record - + + + + and spare1 = #{spare1} + and spare2 = #{spare2} + and spare3 = #{spare3} + and spare4 = #{spare4} + and spare5 = #{spare5} + and spare6 = #{spare6} + and spare7 = #{spare7} + and spare8 = #{spare8} + and spare9 = #{spare9} + and spare10 = #{spare10} + and spare11 = #{spare11} + and spare12 = #{spare12} + and spare13 = #{spare13} + and spare14 = #{spare14} + and spare15 = #{spare15} + + + + + + + insert into check_difference_record_add_info + + check_add_id, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + spare10, + spare11, + spare12, + spare13, + spare14, + spare15, + + + #{checkAddId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spare10}, + #{spare11}, + #{spare12}, + #{spare13}, + #{spare14}, + #{spare15}, + + + + + update check_difference_record_add_info + + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + spare10 = #{spare10}, + spare11 = #{spare11}, + spare12 = #{spare12}, + spare13 = #{spare13}, + spare14 = #{spare14}, + spare15 = #{spare15}, + + where check_add_id = #{checkAddId} + + + + delete from check_difference_record_add_info where check_add_id = #{checkAddId} + + + + delete from check_difference_record_add_info where check_add_id in + + #{checkAddId} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 2590ddc..3338753 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -375,7 +375,7 @@ var param = { pageNum:1, pageSize:99, - typeData:['1','2'] + typeData:['1'] } listWarehouse(param).then(response => { this.warehouseOptions = response.rows; @@ -394,12 +394,11 @@ if (this.formData.checkType==='1'){ this.materialDialogByProduct = true; // 设置查询参数中的仓库ID为主表选择的仓库 - this.queryParams.warehouseId = "01"; + this.queryParams.warehouseId = this.formData.warehouseId; this.getMaterialList(); }else if (this.formData.checkType==='2'){ this.materialDialogByTrayCode = true; // 设置查询参数中的仓库ID为主表选择的仓库 - this.queryParams.warehouseId = "01"; this.getMaterialByTrayCodeList(); } }, @@ -418,7 +417,7 @@ getMaterialByTrayCodeList(){ this.trayLoading = true; if (this.formData.checkType==='2'){ - this.trayQueryParams.warehouseId = "01"; + this.trayQueryParams.warehouseId = this.formData.warehouseId; this.trayQueryParams.status = 2; this.trayQueryParams.locked='N'; this.trayQueryParams.spare7='0'; diff --git a/ruoyi-ui/src/views/check/flat/index.vue b/ruoyi-ui/src/views/check/flat/index.vue index 29ca584..dd49c39 100644 --- a/ruoyi-ui/src/views/check/flat/index.vue +++ b/ruoyi-ui/src/views/check/flat/index.vue @@ -330,7 +330,7 @@ export default { /** 获取仓库列表 */ getWarehouseList() { var data = { - "typeData": ["3"] + "typeData": ["2"] } listWarehouse(data).then(response => { this.warehouseOptions = response.rows; diff --git a/ruoyi-ui/src/views/stock/freeze/index.vue b/ruoyi-ui/src/views/stock/freeze/index.vue index 0a0923c..a66f1a8 100644 --- a/ruoyi-ui/src/views/stock/freeze/index.vue +++ b/ruoyi-ui/src/views/stock/freeze/index.vue @@ -17,14 +17,14 @@ @keyup.enter.native="handleQuery" /> --> - + - + diff --git a/ruoyi-ui/src/views/stock/record/index.vue b/ruoyi-ui/src/views/stock/record/index.vue index bdd5ec5..946850f 100644 --- a/ruoyi-ui/src/views/stock/record/index.vue +++ b/ruoyi-ui/src/views/stock/record/index.vue @@ -33,14 +33,14 @@ @keyup.enter.native="handleQuery" /> - +