lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

盘点审核新增库存

Browse Source
This commit is contained in:
liuhanqing
2025-11-04 16:03:32 +08:00
parent 77c68b95d7
commit ac0cf1b44d
15 changed files with 1039 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
ruoyi-admin/src/main/java/com/ruoyi/check/commit/domain/CheckCommitRecord.java
View File

@@ -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();
}
}

45
ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java
View File

@@ -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<CheckDifferenceRecordAddInfo> 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);

104
ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/controller/CheckDifferenceRecordAddInfoController.java Normal file
View File

@@ -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<CheckDifferenceRecordAddInfo> 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<CheckDifferenceRecordAddInfo> list = checkDifferenceRecordAddInfoService.selectCheckDifferenceRecordAddInfoList(checkDifferenceRecordAddInfo);
ExcelUtil<CheckDifferenceRecordAddInfo> util = new ExcelUtil<CheckDifferenceRecordAddInfo>(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));
}
}

262
ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/domain/CheckDifferenceRecordAddInfo.java Normal file
View File

@@ -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();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/mapper/CheckDifferenceRecordAddInfoMapper.java Normal file
View File

@@ -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<CheckDifferenceRecordAddInfo> 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);
}

61
ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/ICheckDifferenceRecordAddInfoService.java Normal file
View File

@@ -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<CheckDifferenceRecordAddInfo> 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);
}

93
ruoyi-admin/src/main/java/com/ruoyi/check/differenceAdd/service/impl/CheckDifferenceRecordAddInfoServiceImpl.java Normal file
View File

@@ -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<CheckDifferenceRecordAddInfo> 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);
}
}

32
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
View File

@@ -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;

13
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -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);
}

76
ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.check.commit.mapper.CheckCommitRecordMapper">
<resultMap type="CheckCommitRecord" id="CheckCommitRecordResult">
<result property="pdGuid" column="pd_guid" />
<result property="trayCode" column="tray_code" />
@@ -12,15 +12,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
</resultMap>
<sql id="selectCheckCommitRecordVo">
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
</sql>
<select id="selectCheckCommitRecordList" parameterType="CheckCommitRecord" resultMap="CheckCommitRecordResult">
<include refid="selectCheckCommitRecordVo"/>
<where>
<where>
<if test="pdGuid != null "> and pd_guid = #{pdGuid}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
@@ -28,9 +40,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="spare9 != null and spare9 != ''"> and spare9 = #{spare9}</if>
<if test="spare10 != null and spare10 != ''"> and spare10 = #{spare10}</if>
<if test="spare11 != null and spare11 != ''"> and spare11 = #{spare11}</if>
<if test="spare12 != null and spare12 != ''"> and spare12 = #{spare12}</if>
<if test="spare13 != null and spare13 != ''"> and spare13 = #{spare13}</if>
<if test="spare14 != null and spare14 != ''"> and spare14 = #{spare14}</if>
<if test="spare15 != null and spare15 != ''"> and spare15 = #{spare15}</if>
</where>
</select>
<select id="selectCheckCommitRecordByPdGuid" parameterType="Long" resultMap="CheckCommitRecordResult">
<include refid="selectCheckCommitRecordVo"/>
where pd_guid = #{pdGuid}
@@ -45,7 +69,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="trayCode != null">#{trayCode},</if>
<if test="stockId != null">#{stockId},</if>
@@ -53,7 +89,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
</trim>
</insert>
<update id="updateCheckCommitRecord" parameterType="CheckCommitRecord">
@@ -65,6 +113,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
</trim>
where pd_guid = #{pdGuid}
</update>
@@ -74,9 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteCheckCommitRecordByPdGuids" parameterType="String">
delete from check_commit_record where pd_guid in
delete from check_commit_record where pd_guid in
<foreach item="pdGuid" collection="array" open="(" separator="," close=")">
#{pdGuid}
</foreach>
</delete>
</mapper>
</mapper>

128
ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordAddInfoMapper.xml Normal file
View File

@@ -0,0 +1,128 @@
<?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="com.ruoyi.check.differenceAdd.mapper.CheckDifferenceRecordAddInfoMapper">
<resultMap type="CheckDifferenceRecordAddInfo" id="CheckDifferenceRecordAddInfoResult">
<result property="checkAddId" column="check_add_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
</resultMap>
<sql id="selectCheckDifferenceRecordAddInfoVo">
select check_add_id, spare1, spare2, spare3, spare4, spare5, spare6, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15 from check_difference_record_add_info
</sql>
<select id="selectCheckDifferenceRecordAddInfoList" parameterType="CheckDifferenceRecordAddInfo" resultMap="CheckDifferenceRecordAddInfoResult">
<include refid="selectCheckDifferenceRecordAddInfoVo"/>
<where>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="spare9 != null and spare9 != ''"> and spare9 = #{spare9}</if>
<if test="spare10 != null and spare10 != ''"> and spare10 = #{spare10}</if>
<if test="spare11 != null and spare11 != ''"> and spare11 = #{spare11}</if>
<if test="spare12 != null and spare12 != ''"> and spare12 = #{spare12}</if>
<if test="spare13 != null and spare13 != ''"> and spare13 = #{spare13}</if>
<if test="spare14 != null and spare14 != ''"> and spare14 = #{spare14}</if>
<if test="spare15 != null and spare15 != ''"> and spare15 = #{spare15}</if>
</where>
</select>
<select id="selectCheckDifferenceRecordAddInfoByCheckAddId" parameterType="String" resultMap="CheckDifferenceRecordAddInfoResult">
<include refid="selectCheckDifferenceRecordAddInfoVo"/>
where check_add_id = #{checkAddId}
</select>
<insert id="insertCheckDifferenceRecordAddInfo" parameterType="CheckDifferenceRecordAddInfo">
insert into check_difference_record_add_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="checkAddId != null">check_add_id,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="checkAddId != null">#{checkAddId},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
</trim>
</insert>
<update id="updateCheckDifferenceRecordAddInfo" parameterType="CheckDifferenceRecordAddInfo">
update check_difference_record_add_info
<trim prefix="SET" suffixOverrides=",">
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
</trim>
where check_add_id = #{checkAddId}
</update>
<delete id="deleteCheckDifferenceRecordAddInfoByCheckAddId" parameterType="String">
delete from check_difference_record_add_info where check_add_id = #{checkAddId}
</delete>
<delete id="deleteCheckDifferenceRecordAddInfoByCheckAddIds" parameterType="String">
delete from check_difference_record_add_info where check_add_id in
<foreach item="checkAddId" collection="array" open="(" separator="," close=")">
#{checkAddId}
</foreach>
</delete>
</mapper>

7
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -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';

2
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -330,7 +330,7 @@ export default {
/** 获取仓库列表 */
getWarehouseList() {
var data = {
"typeData": ["3"]
"typeData": ["2"]
}
listWarehouse(data).then(response => {
this.warehouseOptions = response.rows;

6
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -17,14 +17,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="物品名称" prop="productName"> <!-- 物品名称 -->
<!-- <el-form-item label="物品名称" prop="productName"> &lt;!&ndash; 物品名称 &ndash;&gt;
<el-input
v-model="queryParams.productName"
placeholder="请输入物品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item label="仓库" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库">
<el-option
@@ -72,7 +72,7 @@
</template>
</el-table-column><!-- 现库位状态 -->
<!-- <el-table-column label="操作" align="left" prop="method" /> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" /> &lt;!&ndash; 仓库 &ndash;&gt;-->
<el-table-column label="仓库" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column label="创建时间" align="left" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <template slot-scope="scope">-->

4
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -33,14 +33,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo"> <!-- 批号 -->
<!-- <el-form-item label="批号" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item label="操作" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;
<el-select v-model="queryParams.method" placeholder="请选择操作" clearable>