盘点管理 基础点位管理 绑定物料 解除物料
This commit is contained in:
liuhanqing
@@ -70,6 +70,16 @@ public class BasProduct extends BaseEntity
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段7")
|
||||
private String spare7;
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段8")
|
||||
private String spare8;
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段9")
|
||||
private String spare9;
|
||||
|
||||
/** 物料名称 */
|
||||
@Excel(name = "物料名称")
|
||||
private String productName;
|
||||
@@ -83,4 +93,8 @@ public class BasProduct extends BaseEntity
|
||||
*/
|
||||
private String lotNo;
|
||||
|
||||
private String totalNetWeight;
|
||||
private String netWeight;
|
||||
private String grossWeight;
|
||||
|
||||
}
|
||||
|
||||
@@ -66,4 +66,8 @@ public interface BasProductMapper
|
||||
* @return
|
||||
*/
|
||||
List<BasProduct> selectBasProductListByProductGuids(@Param("productGuids") List<String> collect);
|
||||
|
||||
BasProduct selectBasProductByProductId(String productId);
|
||||
|
||||
List<BasProduct> selectBasProductListByProductIds(@Param("productIds") List<String> collect);
|
||||
}
|
||||
|
||||
@@ -19,6 +19,8 @@ public interface IBasProductService
|
||||
*/
|
||||
public BasProduct selectBasProductByProductGuid(String productGuid);
|
||||
|
||||
public BasProduct selectBasProductByProductId(String productId);
|
||||
|
||||
/**
|
||||
* 查询物料管理列表
|
||||
*
|
||||
@@ -65,4 +67,6 @@ public interface IBasProductService
|
||||
* @return
|
||||
*/
|
||||
List<BasProduct> selectBasProductListByProductGuids(List<String> collect);
|
||||
|
||||
List<BasProduct> selectBasProductListByProductIds(List<String> collect);
|
||||
}
|
||||
|
||||
@@ -34,6 +34,11 @@ public class BasProductServiceImpl implements IBasProductService
|
||||
return basProductMapper.selectBasProductByProductGuid(productGuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BasProduct selectBasProductByProductId(String productId) {
|
||||
return basProductMapper.selectBasProductByProductId(productId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询物料管理列表
|
||||
*
|
||||
@@ -105,4 +110,12 @@ public class BasProductServiceImpl implements IBasProductService
|
||||
}
|
||||
return basProductMapper.selectBasProductListByProductGuids(collect);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BasProduct> selectBasProductListByProductIds(List<String> collect) {
|
||||
if (CollUtil.isEmpty(collect)){
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return basProductMapper.selectBasProductListByProductIds(collect);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
package com.ruoyi.bas.port.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.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.bas.port.domain.BasProductPort;
|
||||
import com.ruoyi.bas.port.service.IBasProductPortService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 基础点位Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/bas/port")
|
||||
public class BasProductPortController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IBasProductPortService basProductPortService;
|
||||
|
||||
/**
|
||||
* 查询基础点位列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:port:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BasProductPort basProductPort)
|
||||
{
|
||||
startPage();
|
||||
List<BasProductPort> list = basProductPortService.selectBasProductPortList(basProductPort);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出基础点位列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:port:export')")
|
||||
@Log(title = "基础点位", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BasProductPort basProductPort)
|
||||
{
|
||||
List<BasProductPort> list = basProductPortService.selectBasProductPortList(basProductPort);
|
||||
ExcelUtil<BasProductPort> util = new ExcelUtil<BasProductPort>(BasProductPort.class);
|
||||
util.exportExcel(response, list, "基础点位数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取基础点位详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:port:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(basProductPortService.selectBasProductPortById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增基础点位
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:port:add')")
|
||||
@Log(title = "基础点位", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BasProductPort basProductPort)
|
||||
{
|
||||
return toAjax(basProductPortService.insertBasProductPort(basProductPort));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改基础点位
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:port:edit')")
|
||||
@Log(title = "基础点位", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody BasProductPort basProductPort)
|
||||
{
|
||||
return toAjax(basProductPortService.updateBasProductPort(basProductPort));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除基础点位
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:port:remove')")
|
||||
@Log(title = "基础点位", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids)
|
||||
{
|
||||
return toAjax(basProductPortService.deleteBasProductPortByIds(ids));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package com.ruoyi.bas.port.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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 基础点位对象 bas_product_port
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public class BasProductPort extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private String id;
|
||||
|
||||
/** 点位名称 */
|
||||
@Excel(name = "点位名称")
|
||||
private String portName;
|
||||
|
||||
/** 点位分类 */
|
||||
@Excel(name = "点位分类")
|
||||
private String portType;
|
||||
|
||||
/** 点位描述 */
|
||||
@Excel(name = "点位描述")
|
||||
private String portDesc;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createMan;
|
||||
|
||||
|
||||
private List<String> productIdList;
|
||||
|
||||
public List<String> getProductIdList() {
|
||||
return productIdList;
|
||||
}
|
||||
|
||||
public void setProductIdList(List<String> productIdList) {
|
||||
this.productIdList = productIdList;
|
||||
}
|
||||
|
||||
public void setId(String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setPortName(String portName)
|
||||
{
|
||||
this.portName = portName;
|
||||
}
|
||||
|
||||
public String getPortName()
|
||||
{
|
||||
return portName;
|
||||
}
|
||||
|
||||
public void setPortType(String portType)
|
||||
{
|
||||
this.portType = portType;
|
||||
}
|
||||
|
||||
public String getPortType()
|
||||
{
|
||||
return portType;
|
||||
}
|
||||
|
||||
public void setPortDesc(String portDesc)
|
||||
{
|
||||
this.portDesc = portDesc;
|
||||
}
|
||||
|
||||
public String getPortDesc()
|
||||
{
|
||||
return portDesc;
|
||||
}
|
||||
|
||||
public void setCreateMan(String createMan)
|
||||
{
|
||||
this.createMan = createMan;
|
||||
}
|
||||
|
||||
public String getCreateMan()
|
||||
{
|
||||
return createMan;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("portName", getPortName())
|
||||
.append("portType", getPortType())
|
||||
.append("portDesc", getPortDesc())
|
||||
.append("createMan", getCreateMan())
|
||||
.append("createTime", getCreateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.bas.port.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.bas.port.domain.BasProductPort;
|
||||
|
||||
/**
|
||||
* 基础点位Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface BasProductPortMapper
|
||||
{
|
||||
/**
|
||||
* 查询基础点位
|
||||
*
|
||||
* @param id 基础点位主键
|
||||
* @return 基础点位
|
||||
*/
|
||||
public BasProductPort selectBasProductPortById(String id);
|
||||
|
||||
/**
|
||||
* 查询基础点位列表
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 基础点位集合
|
||||
*/
|
||||
public List<BasProductPort> selectBasProductPortList(BasProductPort basProductPort);
|
||||
|
||||
/**
|
||||
* 新增基础点位
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBasProductPort(BasProductPort basProductPort);
|
||||
|
||||
/**
|
||||
* 修改基础点位
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBasProductPort(BasProductPort basProductPort);
|
||||
|
||||
/**
|
||||
* 删除基础点位
|
||||
*
|
||||
* @param id 基础点位主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除基础点位
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortByIds(String[] ids);
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.ruoyi.bas.port.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.bas.port.domain.BasProductPort;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
|
||||
/**
|
||||
* 基础点位Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface IBasProductPortService
|
||||
{
|
||||
/**
|
||||
* 查询基础点位
|
||||
*
|
||||
* @param id 基础点位主键
|
||||
* @return 基础点位
|
||||
*/
|
||||
public BasProductPort selectBasProductPortById(String id);
|
||||
|
||||
/**
|
||||
* 查询基础点位列表
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 基础点位集合
|
||||
*/
|
||||
public List<BasProductPort> selectBasProductPortList(BasProductPort basProductPort);
|
||||
|
||||
/**
|
||||
* 新增基础点位
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBasProductPort(BasProductPort basProductPort);
|
||||
|
||||
/**
|
||||
* 修改基础点位
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBasProductPort(BasProductPort basProductPort);
|
||||
|
||||
/**
|
||||
* 批量删除基础点位
|
||||
*
|
||||
* @param ids 需要删除的基础点位主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除基础点位信息
|
||||
*
|
||||
* @param id 基础点位主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortById(String id);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
package com.ruoyi.bas.port.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.ruoyi.bas.portrel.domain.BasProductPortRel;
|
||||
import com.ruoyi.bas.portrel.service.IBasProductPortRelService;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import org.aspectj.weaver.loadtime.Aj;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.bas.port.mapper.BasProductPortMapper;
|
||||
import com.ruoyi.bas.port.domain.BasProductPort;
|
||||
import com.ruoyi.bas.port.service.IBasProductPortService;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/**
|
||||
* 基础点位Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Service
|
||||
public class BasProductPortServiceImpl implements IBasProductPortService
|
||||
{
|
||||
@Autowired
|
||||
private BasProductPortMapper basProductPortMapper;
|
||||
@Autowired
|
||||
private IBasProductPortRelService basProductPortRelService;
|
||||
|
||||
/**
|
||||
* 查询基础点位
|
||||
*
|
||||
* @param id 基础点位主键
|
||||
* @return 基础点位
|
||||
*/
|
||||
@Override
|
||||
public BasProductPort selectBasProductPortById(String id)
|
||||
{
|
||||
return basProductPortMapper.selectBasProductPortById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询基础点位列表
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 基础点位
|
||||
*/
|
||||
@Override
|
||||
public List<BasProductPort> selectBasProductPortList(BasProductPort basProductPort)
|
||||
{
|
||||
return basProductPortMapper.selectBasProductPortList(basProductPort);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增基础点位
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertBasProductPort(BasProductPort basProductPort)
|
||||
{
|
||||
basProductPort.setCreateTime(DateUtils.getNowDate());
|
||||
basProductPort.setId(IdUtil.fastSimpleUUID());
|
||||
basProductPort.setCreateMan(Convert.toStr(SecurityUtils.getUsername()));
|
||||
return basProductPortMapper.insertBasProductPort(basProductPort);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改基础点位
|
||||
*
|
||||
* @param basProductPort 基础点位
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateBasProductPort(BasProductPort basProductPort)
|
||||
{
|
||||
return basProductPortMapper.updateBasProductPort(basProductPort);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除基础点位
|
||||
*
|
||||
* @param ids 需要删除的基础点位主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBasProductPortByIds(String[] ids)
|
||||
{
|
||||
return basProductPortMapper.deleteBasProductPortByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除基础点位信息
|
||||
*
|
||||
* @param id 基础点位主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBasProductPortById(String id)
|
||||
{
|
||||
return basProductPortMapper.deleteBasProductPortById(id);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
package com.ruoyi.bas.portrel.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
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.bas.portrel.domain.BasProductPortRel;
|
||||
import com.ruoyi.bas.portrel.service.IBasProductPortRelService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 点位与物料关联Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/bas/portProductRel")
|
||||
public class BasProductPortRelController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IBasProductPortRelService basProductPortRelService;
|
||||
|
||||
/**
|
||||
* 查询点位与物料关联列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:portProductRel:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BasProductPortRel basProductPortRel)
|
||||
{
|
||||
startPage();
|
||||
List<BasProduct> list = basProductPortRelService.selectBasProductPortRelList(basProductPortRel);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出点位与物料关联列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:portProductRel:export')")
|
||||
@Log(title = "点位与物料关联", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BasProductPortRel basProductPortRel)
|
||||
{
|
||||
List<BasProduct> list = basProductPortRelService.selectBasProductPortRelList(basProductPortRel);
|
||||
ExcelUtil<BasProduct> util = new ExcelUtil<BasProduct>(BasProduct.class);
|
||||
util.exportExcel(response, list, "点位与物料关联数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取点位与物料关联详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:portProductRel:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
return success(basProductPortRelService.selectBasProductPortRelById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增点位与物料关联
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:portProductRel:add')")
|
||||
@Log(title = "点位与物料关联", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BasProductPortRel basProductPortRel)
|
||||
{
|
||||
return toAjax(basProductPortRelService.insertBasProductPortRel(basProductPortRel));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改点位与物料关联
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:portProductRel:edit')")
|
||||
@Log(title = "点位与物料关联", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody BasProductPortRel basProductPortRel)
|
||||
{
|
||||
return toAjax(basProductPortRelService.updateBasProductPortRel(basProductPortRel));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除点位与物料关联
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('bas:portProductRel:remove')")
|
||||
@Log(title = "点位与物料关联", businessType = BusinessType.DELETE)
|
||||
@PostMapping("/unbind")
|
||||
public AjaxResult remove(@RequestBody BasProductPortRel basProductPortRel)
|
||||
{
|
||||
return toAjax(basProductPortRelService.deleteRelBatch(basProductPortRel));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.ruoyi.bas.portrel.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 点位与物料关联对象 bas_product_port_rel
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class BasProductPortRel extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private Long id;
|
||||
|
||||
/** 物料GUID */
|
||||
@Excel(name = "物料GUID")
|
||||
private String productGuid;
|
||||
|
||||
/** 物料id */
|
||||
@Excel(name = "物料id")
|
||||
private String productId;
|
||||
|
||||
/** 点位id */
|
||||
@Excel(name = "点位id")
|
||||
private String portId;
|
||||
|
||||
/**
|
||||
* 绑定状态
|
||||
*/
|
||||
private String bindStatus;
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
private String productName;
|
||||
|
||||
private List<String> productIds;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.ruoyi.bas.portrel.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.portrel.domain.BasProductPortRel;
|
||||
|
||||
/**
|
||||
* 点位与物料关联Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface BasProductPortRelMapper
|
||||
{
|
||||
/**
|
||||
* 查询点位与物料关联
|
||||
*
|
||||
* @param id 点位与物料关联主键
|
||||
* @return 点位与物料关联
|
||||
*/
|
||||
public BasProductPortRel selectBasProductPortRelById(Long id);
|
||||
|
||||
/**
|
||||
* 查询点位与物料关联列表
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 点位与物料关联集合
|
||||
*/
|
||||
public List<BasProductPortRel> selectBasProductPortRelList(BasProductPortRel basProductPortRel);
|
||||
|
||||
/**
|
||||
* 新增点位与物料关联
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBasProductPortRel(BasProductPortRel basProductPortRel);
|
||||
|
||||
/**
|
||||
* 修改点位与物料关联
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBasProductPortRel(BasProductPortRel basProductPortRel);
|
||||
|
||||
/**
|
||||
* 删除点位与物料关联
|
||||
*
|
||||
* @param id 点位与物料关联主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortRelById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除点位与物料关联
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortRelByIds(Long[] ids);
|
||||
|
||||
List<BasProduct> selectNotBindProduct(BasProductPortRel basProductPortRel);
|
||||
|
||||
int deleteBasProductPortRel(BasProductPortRel rel);
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.ruoyi.bas.portrel.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.portrel.domain.BasProductPortRel;
|
||||
|
||||
/**
|
||||
* 点位与物料关联Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface IBasProductPortRelService
|
||||
{
|
||||
/**
|
||||
* 查询点位与物料关联
|
||||
*
|
||||
* @param id 点位与物料关联主键
|
||||
* @return 点位与物料关联
|
||||
*/
|
||||
public BasProductPortRel selectBasProductPortRelById(Long id);
|
||||
|
||||
/**
|
||||
* 查询点位与物料关联列表
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 点位与物料关联集合
|
||||
*/
|
||||
public List<BasProduct> selectBasProductPortRelList(BasProductPortRel basProductPortRel);
|
||||
|
||||
/**
|
||||
* 新增点位与物料关联
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBasProductPortRel(BasProductPortRel basProductPortRel);
|
||||
|
||||
/**
|
||||
* 修改点位与物料关联
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBasProductPortRel(BasProductPortRel basProductPortRel);
|
||||
|
||||
/**
|
||||
* 批量删除点位与物料关联
|
||||
*
|
||||
* @param ids 需要删除的点位与物料关联主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortRelByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除点位与物料关联信息
|
||||
*
|
||||
* @param id 点位与物料关联主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBasProductPortRelById(Long id);
|
||||
|
||||
int deleteRelBatch(BasProductPortRel basProductPortRel);
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
package com.ruoyi.bas.portrel.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.bas.portrel.mapper.BasProductPortRelMapper;
|
||||
import com.ruoyi.bas.portrel.domain.BasProductPortRel;
|
||||
import com.ruoyi.bas.portrel.service.IBasProductPortRelService;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
/**
|
||||
* 点位与物料关联Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Service
|
||||
public class BasProductPortRelServiceImpl implements IBasProductPortRelService
|
||||
{
|
||||
@Autowired
|
||||
private BasProductPortRelMapper basProductPortRelMapper;
|
||||
|
||||
/**
|
||||
* 查询点位与物料关联
|
||||
*
|
||||
* @param id 点位与物料关联主键
|
||||
* @return 点位与物料关联
|
||||
*/
|
||||
@Override
|
||||
public BasProductPortRel selectBasProductPortRelById(Long id)
|
||||
{
|
||||
return basProductPortRelMapper.selectBasProductPortRelById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询点位与物料关联列表
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 点位与物料关联
|
||||
*/
|
||||
@Override
|
||||
public List<BasProduct> selectBasProductPortRelList(BasProductPortRel basProductPortRel)
|
||||
{
|
||||
return basProductPortRelMapper.selectNotBindProduct(basProductPortRel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增点位与物料关联
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertBasProductPortRel(BasProductPortRel basProductPortRel)
|
||||
{
|
||||
int i = 0;
|
||||
for (String productId : basProductPortRel.getProductIds()) {
|
||||
BasProductPortRel basProductPortRel1 = new BasProductPortRel();
|
||||
basProductPortRel1.setProductId(productId);
|
||||
basProductPortRel1.setPortId(basProductPortRel.getPortId());
|
||||
i +=basProductPortRelMapper.insertBasProductPortRel(basProductPortRel1);
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改点位与物料关联
|
||||
*
|
||||
* @param basProductPortRel 点位与物料关联
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateBasProductPortRel(BasProductPortRel basProductPortRel)
|
||||
{
|
||||
return basProductPortRelMapper.updateBasProductPortRel(basProductPortRel);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除点位与物料关联
|
||||
*
|
||||
* @param ids 需要删除的点位与物料关联主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBasProductPortRelByIds(Long[] ids)
|
||||
{
|
||||
return basProductPortRelMapper.deleteBasProductPortRelByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除点位与物料关联信息
|
||||
*
|
||||
* @param id 点位与物料关联主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBasProductPortRelById(Long id)
|
||||
{
|
||||
return basProductPortRelMapper.deleteBasProductPortRelById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int deleteRelBatch(BasProductPortRel basProductPortRel) {
|
||||
return basProductPortRelMapper.deleteBasProductPortRel(basProductPortRel);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.ruoyi.check.stockcheck.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.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.stockcheck.domain.CheckStockin;
|
||||
import com.ruoyi.check.stockcheck.service.ICheckStockinService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库单据主信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/check/stockCheck")
|
||||
public class CheckStockinController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private ICheckStockinService checkStockinService;
|
||||
|
||||
/**
|
||||
* 查询盘库单据主信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheck:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(CheckStockin checkStockin)
|
||||
{
|
||||
startPage();
|
||||
List<CheckStockin> list = checkStockinService.selectCheckStockinList(checkStockin);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库单据主信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheck:export')")
|
||||
@Log(title = "盘库单据主信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, CheckStockin checkStockin)
|
||||
{
|
||||
List<CheckStockin> list = checkStockinService.selectCheckStockinList(checkStockin);
|
||||
ExcelUtil<CheckStockin> util = new ExcelUtil<CheckStockin>(CheckStockin.class);
|
||||
util.exportExcel(response, list, "盘库单据主信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库单据主信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheck:query')")
|
||||
@GetMapping(value = "/{stockGuid}")
|
||||
public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid)
|
||||
{
|
||||
return success(checkStockinService.selectCheckStockinByStockGuid(stockGuid));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheck:add')")
|
||||
@Log(title = "盘库单据主信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody CheckStockin checkStockin)
|
||||
{
|
||||
return toAjax(checkStockinService.insertCheckStockin(checkStockin));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheck:edit')")
|
||||
@Log(title = "盘库单据主信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody CheckStockin checkStockin)
|
||||
{
|
||||
return toAjax(checkStockinService.updateCheckStockin(checkStockin));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheck:remove')")
|
||||
@Log(title = "盘库单据主信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockGuids}")
|
||||
public AjaxResult remove(@PathVariable String[] stockGuids)
|
||||
{
|
||||
return toAjax(checkStockinService.deleteCheckStockinByStockGuids(stockGuids));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,307 @@
|
||||
package com.ruoyi.check.stockcheck.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_stockin
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public class CheckStockin extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** GUID */
|
||||
private String stockGuid;
|
||||
|
||||
/** 盘点单据ID */
|
||||
@Excel(name = "盘点单据ID")
|
||||
private String stockCheckId;
|
||||
|
||||
/** 盘库类型 */
|
||||
@Excel(name = "盘库类型")
|
||||
private String checkType;
|
||||
|
||||
/** 建立时间 */
|
||||
@Excel(name = "建立时间")
|
||||
private String createDate;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createManId;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String status;
|
||||
|
||||
/** 仓库ID */
|
||||
@Excel(name = "仓库ID")
|
||||
private String warehouseId;
|
||||
|
||||
/** 完成日期 */
|
||||
@Excel(name = " 完成日期")
|
||||
private String finishDate;
|
||||
|
||||
/** erp单号 */
|
||||
@Excel(name = "erp单号")
|
||||
private String erpBill;
|
||||
|
||||
/** 单据来源 */
|
||||
@Excel(name = "单据来源")
|
||||
private String stockSource;
|
||||
|
||||
/** 部门编码 */
|
||||
@Excel(name = "部门编码")
|
||||
private String departmentNo;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerNo;
|
||||
|
||||
/** 班组编码 */
|
||||
@Excel(name = "班组编码")
|
||||
private String classNo;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierNo;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
public void setStockGuid(String stockGuid)
|
||||
{
|
||||
this.stockGuid = stockGuid;
|
||||
}
|
||||
|
||||
public String getStockGuid()
|
||||
{
|
||||
return stockGuid;
|
||||
}
|
||||
|
||||
public void setStockCheckId(String stockCheckId)
|
||||
{
|
||||
this.stockCheckId = stockCheckId;
|
||||
}
|
||||
|
||||
public String getStockCheckId()
|
||||
{
|
||||
return stockCheckId;
|
||||
}
|
||||
|
||||
public void setCheckType(String checkType)
|
||||
{
|
||||
this.checkType = checkType;
|
||||
}
|
||||
|
||||
public String getCheckType()
|
||||
{
|
||||
return checkType;
|
||||
}
|
||||
|
||||
public void setCreateDate(String createDate)
|
||||
{
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
public String getCreateDate()
|
||||
{
|
||||
return createDate;
|
||||
}
|
||||
|
||||
public void setCreateManId(String createManId)
|
||||
{
|
||||
this.createManId = createManId;
|
||||
}
|
||||
|
||||
public String getCreateManId()
|
||||
{
|
||||
return createManId;
|
||||
}
|
||||
|
||||
public void setStatus(String status)
|
||||
{
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus()
|
||||
{
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setFinishDate(String finishDate)
|
||||
{
|
||||
this.finishDate = finishDate;
|
||||
}
|
||||
|
||||
public String getFinishDate()
|
||||
{
|
||||
return finishDate;
|
||||
}
|
||||
|
||||
public void setErpBill(String erpBill)
|
||||
{
|
||||
this.erpBill = erpBill;
|
||||
}
|
||||
|
||||
public String getErpBill()
|
||||
{
|
||||
return erpBill;
|
||||
}
|
||||
|
||||
public void setStockSource(String stockSource)
|
||||
{
|
||||
this.stockSource = stockSource;
|
||||
}
|
||||
|
||||
public String getStockSource()
|
||||
{
|
||||
return stockSource;
|
||||
}
|
||||
|
||||
public void setDepartmentNo(String departmentNo)
|
||||
{
|
||||
this.departmentNo = departmentNo;
|
||||
}
|
||||
|
||||
public String getDepartmentNo()
|
||||
{
|
||||
return departmentNo;
|
||||
}
|
||||
|
||||
public void setCustomerNo(String customerNo)
|
||||
{
|
||||
this.customerNo = customerNo;
|
||||
}
|
||||
|
||||
public String getCustomerNo()
|
||||
{
|
||||
return customerNo;
|
||||
}
|
||||
|
||||
public void setClassNo(String classNo)
|
||||
{
|
||||
this.classNo = classNo;
|
||||
}
|
||||
|
||||
public String getClassNo()
|
||||
{
|
||||
return classNo;
|
||||
}
|
||||
|
||||
public void setSupplierNo(String supplierNo)
|
||||
{
|
||||
this.supplierNo = supplierNo;
|
||||
}
|
||||
|
||||
public String getSupplierNo()
|
||||
{
|
||||
return supplierNo;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockGuid", getStockGuid())
|
||||
.append("stockCheckId", getStockCheckId())
|
||||
.append("checkType", getCheckType())
|
||||
.append("createDate", getCreateDate())
|
||||
.append("createManId", getCreateManId())
|
||||
.append("status", getStatus())
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("finishDate", getFinishDate())
|
||||
.append("erpBill", getErpBill())
|
||||
.append("stockSource", getStockSource())
|
||||
.append("departmentNo", getDepartmentNo())
|
||||
.append("customerNo", getCustomerNo())
|
||||
.append("classNo", getClassNo())
|
||||
.append("supplierNo", getSupplierNo())
|
||||
.append("spare1", getSpare1())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare3", getSpare3())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare5", getSpare5())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheck.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheck.domain.CheckStockin;
|
||||
|
||||
/**
|
||||
* 盘库单据主信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface CheckStockinMapper
|
||||
{
|
||||
/**
|
||||
* 查询盘库单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库单据主信息主键
|
||||
* @return 盘库单据主信息
|
||||
*/
|
||||
public CheckStockin selectCheckStockinByStockGuid(String stockGuid);
|
||||
|
||||
/**
|
||||
* 查询盘库单据主信息列表
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 盘库单据主信息集合
|
||||
*/
|
||||
public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin);
|
||||
|
||||
/**
|
||||
* 新增盘库单据主信息
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockin(CheckStockin checkStockin);
|
||||
|
||||
/**
|
||||
* 修改盘库单据主信息
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockin(CheckStockin checkStockin);
|
||||
|
||||
/**
|
||||
* 删除盘库单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinByStockGuid(String stockGuid);
|
||||
|
||||
/**
|
||||
* 批量删除盘库单据主信息
|
||||
*
|
||||
* @param stockGuids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinByStockGuids(String[] stockGuids);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheck.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheck.domain.CheckStockin;
|
||||
|
||||
/**
|
||||
* 盘库单据主信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface ICheckStockinService
|
||||
{
|
||||
/**
|
||||
* 查询盘库单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库单据主信息主键
|
||||
* @return 盘库单据主信息
|
||||
*/
|
||||
public CheckStockin selectCheckStockinByStockGuid(String stockGuid);
|
||||
|
||||
/**
|
||||
* 查询盘库单据主信息列表
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 盘库单据主信息集合
|
||||
*/
|
||||
public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin);
|
||||
|
||||
/**
|
||||
* 新增盘库单据主信息
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockin(CheckStockin checkStockin);
|
||||
|
||||
/**
|
||||
* 修改盘库单据主信息
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockin(CheckStockin checkStockin);
|
||||
|
||||
/**
|
||||
* 批量删除盘库单据主信息
|
||||
*
|
||||
* @param stockGuids 需要删除的盘库单据主信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinByStockGuids(String[] stockGuids);
|
||||
|
||||
/**
|
||||
* 删除盘库单据主信息信息
|
||||
*
|
||||
* @param stockGuid 盘库单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinByStockGuid(String stockGuid);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.ruoyi.check.stockcheck.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.check.stockcheck.mapper.CheckStockinMapper;
|
||||
import com.ruoyi.check.stockcheck.domain.CheckStockin;
|
||||
import com.ruoyi.check.stockcheck.service.ICheckStockinService;
|
||||
|
||||
/**
|
||||
* 盘库单据主信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Service
|
||||
public class CheckStockinServiceImpl implements ICheckStockinService
|
||||
{
|
||||
@Autowired
|
||||
private CheckStockinMapper checkStockinMapper;
|
||||
|
||||
/**
|
||||
* 查询盘库单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库单据主信息主键
|
||||
* @return 盘库单据主信息
|
||||
*/
|
||||
@Override
|
||||
public CheckStockin selectCheckStockinByStockGuid(String stockGuid)
|
||||
{
|
||||
return checkStockinMapper.selectCheckStockinByStockGuid(stockGuid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询盘库单据主信息列表
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 盘库单据主信息
|
||||
*/
|
||||
@Override
|
||||
public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin)
|
||||
{
|
||||
return checkStockinMapper.selectCheckStockinList(checkStockin);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库单据主信息
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertCheckStockin(CheckStockin checkStockin)
|
||||
{
|
||||
return checkStockinMapper.insertCheckStockin(checkStockin);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库单据主信息
|
||||
*
|
||||
* @param checkStockin 盘库单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateCheckStockin(CheckStockin checkStockin)
|
||||
{
|
||||
return checkStockinMapper.updateCheckStockin(checkStockin);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除盘库单据主信息
|
||||
*
|
||||
* @param stockGuids 需要删除的盘库单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinByStockGuids(String[] stockGuids)
|
||||
{
|
||||
return checkStockinMapper.deleteCheckStockinByStockGuids(stockGuids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库单据主信息信息
|
||||
*
|
||||
* @param stockGuid 盘库单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinByStockGuid(String stockGuid)
|
||||
{
|
||||
return checkStockinMapper.deleteCheckStockinByStockGuid(stockGuid);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.ruoyi.check.stockcheckdetail.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.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.stockcheckdetail.domain.CheckStockinDetail;
|
||||
import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库单据子信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/check/stockCheckDetail")
|
||||
public class CheckStockinDetailController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private ICheckStockinDetailService checkStockinDetailService;
|
||||
|
||||
/**
|
||||
* 查询盘库单据子信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetail:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
startPage();
|
||||
List<CheckStockinDetail> list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库单据子信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetail:export')")
|
||||
@Log(title = "盘库单据子信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
List<CheckStockinDetail> list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail);
|
||||
ExcelUtil<CheckStockinDetail> util = new ExcelUtil<CheckStockinDetail>(CheckStockinDetail.class);
|
||||
util.exportExcel(response, list, "盘库单据子信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库单据子信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetail:query')")
|
||||
@GetMapping(value = "/{stockCheckDetailId}")
|
||||
public AjaxResult getInfo(@PathVariable("stockCheckDetailId") String stockCheckDetailId)
|
||||
{
|
||||
return success(checkStockinDetailService.selectCheckStockinDetailByStockCheckDetailId(stockCheckDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetail:add')")
|
||||
@Log(title = "盘库单据子信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
return toAjax(checkStockinDetailService.insertCheckStockinDetail(checkStockinDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetail:edit')")
|
||||
@Log(title = "盘库单据子信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
return toAjax(checkStockinDetailService.updateCheckStockinDetail(checkStockinDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetail:remove')")
|
||||
@Log(title = "盘库单据子信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockCheckDetailIds}")
|
||||
public AjaxResult remove(@PathVariable String[] stockCheckDetailIds)
|
||||
{
|
||||
return toAjax(checkStockinDetailService.deleteCheckStockinDetailByStockCheckDetailIds(stockCheckDetailIds));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,458 @@
|
||||
package com.ruoyi.check.stockcheckdetail.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_stockin_detail
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public class CheckStockinDetail extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 子单ID */
|
||||
private String stockCheckDetailId;
|
||||
|
||||
/** 主单GUID */
|
||||
@Excel(name = "主单GUID")
|
||||
private String stockCheckGuid;
|
||||
|
||||
/** 主单ID */
|
||||
@Excel(name = "主单ID")
|
||||
private String stockCheckId;
|
||||
|
||||
/** 批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String lotNo;
|
||||
|
||||
/** 物料ID */
|
||||
@Excel(name = "物料ID")
|
||||
private String productGuid;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String productId;
|
||||
|
||||
/** 计划数量 */
|
||||
@Excel(name = "计划数量")
|
||||
private String quantity;
|
||||
|
||||
/** 计划数量(箱) */
|
||||
@Excel(name = "计划数量(箱)")
|
||||
private String quantityX;
|
||||
|
||||
/** 计划数量(件) */
|
||||
@Excel(name = "计划数量(件)")
|
||||
private String quantityJ;
|
||||
|
||||
/** 参考单价 */
|
||||
@Excel(name = "参考单价")
|
||||
private String price;
|
||||
|
||||
/** 品牌 */
|
||||
@Excel(name = "品牌")
|
||||
private String cargoNo;
|
||||
|
||||
/** 实际数量 */
|
||||
@Excel(name = "实际数量")
|
||||
private String assignNum;
|
||||
|
||||
/** 实际数量(箱) */
|
||||
@Excel(name = "实际数量(箱)")
|
||||
private String assignNumX;
|
||||
|
||||
/** 实际数量(件) */
|
||||
@Excel(name = "实际数量(件)")
|
||||
private String assignNumJ;
|
||||
|
||||
/** 入库日期 */
|
||||
@Excel(name = "入库日期")
|
||||
private String printDate;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String stockStatus;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierId;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerId;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 规格 */
|
||||
@Excel(name = "规格")
|
||||
private String spec;
|
||||
|
||||
/** 扫码数量 */
|
||||
@Excel(name = "扫码数量")
|
||||
private String scanNum;
|
||||
|
||||
/** 扫码数量(箱) */
|
||||
@Excel(name = "扫码数量(箱)")
|
||||
private String scanNumX;
|
||||
|
||||
/** 扫码数量(件) */
|
||||
@Excel(name = "扫码数量(件)")
|
||||
private String scanNumJ;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
|
||||
public void setStockCheckDetailId(String stockCheckDetailId)
|
||||
{
|
||||
this.stockCheckDetailId = stockCheckDetailId;
|
||||
}
|
||||
|
||||
public String getStockCheckDetailId()
|
||||
{
|
||||
return stockCheckDetailId;
|
||||
}
|
||||
|
||||
public void setStockCheckGuid(String stockCheckGuid)
|
||||
{
|
||||
this.stockCheckGuid = stockCheckGuid;
|
||||
}
|
||||
|
||||
public String getStockCheckGuid()
|
||||
{
|
||||
return stockCheckGuid;
|
||||
}
|
||||
|
||||
public void setStockCheckId(String stockCheckId)
|
||||
{
|
||||
this.stockCheckId = stockCheckId;
|
||||
}
|
||||
|
||||
public String getStockCheckId()
|
||||
{
|
||||
return stockCheckId;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo)
|
||||
{
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getLotNo()
|
||||
{
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setProductGuid(String productGuid)
|
||||
{
|
||||
this.productGuid = productGuid;
|
||||
}
|
||||
|
||||
public String getProductGuid()
|
||||
{
|
||||
return productGuid;
|
||||
}
|
||||
|
||||
public void setProductId(String productId)
|
||||
{
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductId()
|
||||
{
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setQuantity(String quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getQuantity()
|
||||
{
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantityX(String quantityX)
|
||||
{
|
||||
this.quantityX = quantityX;
|
||||
}
|
||||
|
||||
public String getQuantityX()
|
||||
{
|
||||
return quantityX;
|
||||
}
|
||||
|
||||
public void setQuantityJ(String quantityJ)
|
||||
{
|
||||
this.quantityJ = quantityJ;
|
||||
}
|
||||
|
||||
public String getQuantityJ()
|
||||
{
|
||||
return quantityJ;
|
||||
}
|
||||
|
||||
public void setPrice(String price)
|
||||
{
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public String getPrice()
|
||||
{
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setCargoNo(String cargoNo)
|
||||
{
|
||||
this.cargoNo = cargoNo;
|
||||
}
|
||||
|
||||
public String getCargoNo()
|
||||
{
|
||||
return cargoNo;
|
||||
}
|
||||
|
||||
public void setAssignNum(String assignNum)
|
||||
{
|
||||
this.assignNum = assignNum;
|
||||
}
|
||||
|
||||
public String getAssignNum()
|
||||
{
|
||||
return assignNum;
|
||||
}
|
||||
|
||||
public void setAssignNumX(String assignNumX)
|
||||
{
|
||||
this.assignNumX = assignNumX;
|
||||
}
|
||||
|
||||
public String getAssignNumX()
|
||||
{
|
||||
return assignNumX;
|
||||
}
|
||||
|
||||
public void setAssignNumJ(String assignNumJ)
|
||||
{
|
||||
this.assignNumJ = assignNumJ;
|
||||
}
|
||||
|
||||
public String getAssignNumJ()
|
||||
{
|
||||
return assignNumJ;
|
||||
}
|
||||
|
||||
public void setPrintDate(String printDate)
|
||||
{
|
||||
this.printDate = printDate;
|
||||
}
|
||||
|
||||
public String getPrintDate()
|
||||
{
|
||||
return printDate;
|
||||
}
|
||||
|
||||
public void setStockStatus(String stockStatus)
|
||||
{
|
||||
this.stockStatus = stockStatus;
|
||||
}
|
||||
|
||||
public String getStockStatus()
|
||||
{
|
||||
return stockStatus;
|
||||
}
|
||||
|
||||
public void setSupplierId(String supplierId)
|
||||
{
|
||||
this.supplierId = supplierId;
|
||||
}
|
||||
|
||||
public String getSupplierId()
|
||||
{
|
||||
return supplierId;
|
||||
}
|
||||
|
||||
public void setCustomerId(String customerId)
|
||||
{
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
public String getCustomerId()
|
||||
{
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setUnit(String unit)
|
||||
{
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit()
|
||||
{
|
||||
return unit;
|
||||
}
|
||||
|
||||
public void setSpec(String spec)
|
||||
{
|
||||
this.spec = spec;
|
||||
}
|
||||
|
||||
public String getSpec()
|
||||
{
|
||||
return spec;
|
||||
}
|
||||
|
||||
public void setScanNum(String scanNum)
|
||||
{
|
||||
this.scanNum = scanNum;
|
||||
}
|
||||
|
||||
public String getScanNum()
|
||||
{
|
||||
return scanNum;
|
||||
}
|
||||
|
||||
public void setScanNumX(String scanNumX)
|
||||
{
|
||||
this.scanNumX = scanNumX;
|
||||
}
|
||||
|
||||
public String getScanNumX()
|
||||
{
|
||||
return scanNumX;
|
||||
}
|
||||
|
||||
public void setScanNumJ(String scanNumJ)
|
||||
{
|
||||
this.scanNumJ = scanNumJ;
|
||||
}
|
||||
|
||||
public String getScanNumJ()
|
||||
{
|
||||
return scanNumJ;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockCheckDetailId", getStockCheckDetailId())
|
||||
.append("stockCheckGuid", getStockCheckGuid())
|
||||
.append("stockCheckId", getStockCheckId())
|
||||
.append("lotNo", getLotNo())
|
||||
.append("productGuid", getProductGuid())
|
||||
.append("productId", getProductId())
|
||||
.append("quantity", getQuantity())
|
||||
.append("quantityX", getQuantityX())
|
||||
.append("quantityJ", getQuantityJ())
|
||||
.append("price", getPrice())
|
||||
.append("cargoNo", getCargoNo())
|
||||
.append("remark", getRemark())
|
||||
.append("assignNum", getAssignNum())
|
||||
.append("assignNumX", getAssignNumX())
|
||||
.append("assignNumJ", getAssignNumJ())
|
||||
.append("printDate", getPrintDate())
|
||||
.append("stockStatus", getStockStatus())
|
||||
.append("supplierId", getSupplierId())
|
||||
.append("customerId", getCustomerId())
|
||||
.append("unit", getUnit())
|
||||
.append("spec", getSpec())
|
||||
.append("scanNum", getScanNum())
|
||||
.append("scanNumX", getScanNumX())
|
||||
.append("scanNumJ", getScanNumJ())
|
||||
.append("spare1", getSpare1())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare3", getSpare3())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare6", getSpare6())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheckdetail.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
|
||||
|
||||
/**
|
||||
* 盘库单据子信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface CheckStockinDetailMapper
|
||||
{
|
||||
/**
|
||||
* 查询盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库单据子信息主键
|
||||
* @return 盘库单据子信息
|
||||
*/
|
||||
public CheckStockinDetail selectCheckStockinDetailByStockCheckDetailId(String stockCheckDetailId);
|
||||
|
||||
/**
|
||||
* 查询盘库单据子信息列表
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 盘库单据子信息集合
|
||||
*/
|
||||
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail);
|
||||
|
||||
/**
|
||||
* 新增盘库单据子信息
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockinDetail(CheckStockinDetail checkStockinDetail);
|
||||
|
||||
/**
|
||||
* 修改盘库单据子信息
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockinDetail(CheckStockinDetail checkStockinDetail);
|
||||
|
||||
/**
|
||||
* 删除盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailByStockCheckDetailId(String stockCheckDetailId);
|
||||
|
||||
/**
|
||||
* 批量删除盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailByStockCheckDetailIds(String[] stockCheckDetailIds);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheckdetail.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
|
||||
|
||||
/**
|
||||
* 盘库单据子信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface ICheckStockinDetailService
|
||||
{
|
||||
/**
|
||||
* 查询盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库单据子信息主键
|
||||
* @return 盘库单据子信息
|
||||
*/
|
||||
public CheckStockinDetail selectCheckStockinDetailByStockCheckDetailId(String stockCheckDetailId);
|
||||
|
||||
/**
|
||||
* 查询盘库单据子信息列表
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 盘库单据子信息集合
|
||||
*/
|
||||
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail);
|
||||
|
||||
/**
|
||||
* 新增盘库单据子信息
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockinDetail(CheckStockinDetail checkStockinDetail);
|
||||
|
||||
/**
|
||||
* 修改盘库单据子信息
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockinDetail(CheckStockinDetail checkStockinDetail);
|
||||
|
||||
/**
|
||||
* 批量删除盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailIds 需要删除的盘库单据子信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailByStockCheckDetailIds(String[] stockCheckDetailIds);
|
||||
|
||||
/**
|
||||
* 删除盘库单据子信息信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailByStockCheckDetailId(String stockCheckDetailId);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.ruoyi.check.stockcheckdetail.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.check.stockcheckdetail.mapper.CheckStockinDetailMapper;
|
||||
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
|
||||
import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService;
|
||||
|
||||
/**
|
||||
* 盘库单据子信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Service
|
||||
public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService
|
||||
{
|
||||
@Autowired
|
||||
private CheckStockinDetailMapper checkStockinDetailMapper;
|
||||
|
||||
/**
|
||||
* 查询盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库单据子信息主键
|
||||
* @return 盘库单据子信息
|
||||
*/
|
||||
@Override
|
||||
public CheckStockinDetail selectCheckStockinDetailByStockCheckDetailId(String stockCheckDetailId)
|
||||
{
|
||||
return checkStockinDetailMapper.selectCheckStockinDetailByStockCheckDetailId(stockCheckDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询盘库单据子信息列表
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 盘库单据子信息
|
||||
*/
|
||||
@Override
|
||||
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库单据子信息
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertCheckStockinDetail(CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
return checkStockinDetailMapper.insertCheckStockinDetail(checkStockinDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库单据子信息
|
||||
*
|
||||
* @param checkStockinDetail 盘库单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateCheckStockinDetail(CheckStockinDetail checkStockinDetail)
|
||||
{
|
||||
return checkStockinDetailMapper.updateCheckStockinDetail(checkStockinDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除盘库单据子信息
|
||||
*
|
||||
* @param stockCheckDetailIds 需要删除的盘库单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinDetailByStockCheckDetailIds(String[] stockCheckDetailIds)
|
||||
{
|
||||
return checkStockinDetailMapper.deleteCheckStockinDetailByStockCheckDetailIds(stockCheckDetailIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库单据子信息信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinDetailByStockCheckDetailId(String stockCheckDetailId)
|
||||
{
|
||||
return checkStockinDetailMapper.deleteCheckStockinDetailByStockCheckDetailId(stockCheckDetailId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.ruoyi.check.stockcheckdetailfinish.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.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.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
|
||||
import com.ruoyi.check.stockcheckdetailfinish.service.ICheckStockinDetailFinishService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库历史单据子信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/check/stockCheckDetailFinish")
|
||||
public class CheckStockinDetailFinishController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private ICheckStockinDetailFinishService checkStockinDetailFinishService;
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据子信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetailFinish:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
startPage();
|
||||
List<CheckStockinDetailFinish> list = checkStockinDetailFinishService.selectCheckStockinDetailFinishList(checkStockinDetailFinish);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库历史单据子信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetailFinish:export')")
|
||||
@Log(title = "盘库历史单据子信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
List<CheckStockinDetailFinish> list = checkStockinDetailFinishService.selectCheckStockinDetailFinishList(checkStockinDetailFinish);
|
||||
ExcelUtil<CheckStockinDetailFinish> util = new ExcelUtil<CheckStockinDetailFinish>(CheckStockinDetailFinish.class);
|
||||
util.exportExcel(response, list, "盘库历史单据子信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库历史单据子信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetailFinish:query')")
|
||||
@GetMapping(value = "/{stockCheckDetailId}")
|
||||
public AjaxResult getInfo(@PathVariable("stockCheckDetailId") String stockCheckDetailId)
|
||||
{
|
||||
return success(checkStockinDetailFinishService.selectCheckStockinDetailFinishByStockCheckDetailId(stockCheckDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetailFinish:add')")
|
||||
@Log(title = "盘库历史单据子信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
return toAjax(checkStockinDetailFinishService.insertCheckStockinDetailFinish(checkStockinDetailFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetailFinish:edit')")
|
||||
@Log(title = "盘库历史单据子信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
return toAjax(checkStockinDetailFinishService.updateCheckStockinDetailFinish(checkStockinDetailFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据子信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckDetailFinish:remove')")
|
||||
@Log(title = "盘库历史单据子信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockCheckDetailIds}")
|
||||
public AjaxResult remove(@PathVariable String[] stockCheckDetailIds)
|
||||
{
|
||||
return toAjax(checkStockinDetailFinishService.deleteCheckStockinDetailFinishByStockCheckDetailIds(stockCheckDetailIds));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,458 @@
|
||||
package com.ruoyi.check.stockcheckdetailfinish.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_stockin_detail_finish
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public class CheckStockinDetailFinish extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 子单ID */
|
||||
private String stockCheckDetailId;
|
||||
|
||||
/** 主单GUID */
|
||||
@Excel(name = "主单GUID")
|
||||
private String stockCheckGuid;
|
||||
|
||||
/** 主单ID */
|
||||
@Excel(name = "主单ID")
|
||||
private String stockCheckId;
|
||||
|
||||
/** 批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String lotNo;
|
||||
|
||||
/** 物料ID */
|
||||
@Excel(name = "物料ID")
|
||||
private String productGuid;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String productId;
|
||||
|
||||
/** 计划数量 */
|
||||
@Excel(name = "计划数量")
|
||||
private String quantity;
|
||||
|
||||
/** 计划数量(箱) */
|
||||
@Excel(name = "计划数量(箱)")
|
||||
private String quantityX;
|
||||
|
||||
/** 计划数量(件) */
|
||||
@Excel(name = "计划数量(件)")
|
||||
private String quantityJ;
|
||||
|
||||
/** 参考单价 */
|
||||
@Excel(name = "参考单价")
|
||||
private String price;
|
||||
|
||||
/** 品牌 */
|
||||
@Excel(name = "品牌")
|
||||
private String cargoNo;
|
||||
|
||||
/** 实际数量 */
|
||||
@Excel(name = "实际数量")
|
||||
private String assignNum;
|
||||
|
||||
/** 实际数量(箱) */
|
||||
@Excel(name = "实际数量(箱)")
|
||||
private String assignNumX;
|
||||
|
||||
/** 实际数量(件) */
|
||||
@Excel(name = "实际数量(件)")
|
||||
private String assignNumJ;
|
||||
|
||||
/** 入库日期 */
|
||||
@Excel(name = "入库日期")
|
||||
private String printDate;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String stockStatus;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierId;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerId;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 规格 */
|
||||
@Excel(name = "规格")
|
||||
private String spec;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
|
||||
/** 扫码数量 */
|
||||
@Excel(name = "扫码数量")
|
||||
private String scanNum;
|
||||
|
||||
/** 扫码数量(箱) */
|
||||
@Excel(name = "扫码数量(箱)")
|
||||
private String scanNumX;
|
||||
|
||||
/** 扫码数量(件) */
|
||||
@Excel(name = "扫码数量(件)")
|
||||
private String scanNumJ;
|
||||
|
||||
public void setStockCheckDetailId(String stockCheckDetailId)
|
||||
{
|
||||
this.stockCheckDetailId = stockCheckDetailId;
|
||||
}
|
||||
|
||||
public String getStockCheckDetailId()
|
||||
{
|
||||
return stockCheckDetailId;
|
||||
}
|
||||
|
||||
public void setStockCheckGuid(String stockCheckGuid)
|
||||
{
|
||||
this.stockCheckGuid = stockCheckGuid;
|
||||
}
|
||||
|
||||
public String getStockCheckGuid()
|
||||
{
|
||||
return stockCheckGuid;
|
||||
}
|
||||
|
||||
public void setStockCheckId(String stockCheckId)
|
||||
{
|
||||
this.stockCheckId = stockCheckId;
|
||||
}
|
||||
|
||||
public String getStockCheckId()
|
||||
{
|
||||
return stockCheckId;
|
||||
}
|
||||
|
||||
public void setLotNo(String lotNo)
|
||||
{
|
||||
this.lotNo = lotNo;
|
||||
}
|
||||
|
||||
public String getLotNo()
|
||||
{
|
||||
return lotNo;
|
||||
}
|
||||
|
||||
public void setProductGuid(String productGuid)
|
||||
{
|
||||
this.productGuid = productGuid;
|
||||
}
|
||||
|
||||
public String getProductGuid()
|
||||
{
|
||||
return productGuid;
|
||||
}
|
||||
|
||||
public void setProductId(String productId)
|
||||
{
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductId()
|
||||
{
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setQuantity(String quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getQuantity()
|
||||
{
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantityX(String quantityX)
|
||||
{
|
||||
this.quantityX = quantityX;
|
||||
}
|
||||
|
||||
public String getQuantityX()
|
||||
{
|
||||
return quantityX;
|
||||
}
|
||||
|
||||
public void setQuantityJ(String quantityJ)
|
||||
{
|
||||
this.quantityJ = quantityJ;
|
||||
}
|
||||
|
||||
public String getQuantityJ()
|
||||
{
|
||||
return quantityJ;
|
||||
}
|
||||
|
||||
public void setPrice(String price)
|
||||
{
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public String getPrice()
|
||||
{
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setCargoNo(String cargoNo)
|
||||
{
|
||||
this.cargoNo = cargoNo;
|
||||
}
|
||||
|
||||
public String getCargoNo()
|
||||
{
|
||||
return cargoNo;
|
||||
}
|
||||
|
||||
public void setAssignNum(String assignNum)
|
||||
{
|
||||
this.assignNum = assignNum;
|
||||
}
|
||||
|
||||
public String getAssignNum()
|
||||
{
|
||||
return assignNum;
|
||||
}
|
||||
|
||||
public void setAssignNumX(String assignNumX)
|
||||
{
|
||||
this.assignNumX = assignNumX;
|
||||
}
|
||||
|
||||
public String getAssignNumX()
|
||||
{
|
||||
return assignNumX;
|
||||
}
|
||||
|
||||
public void setAssignNumJ(String assignNumJ)
|
||||
{
|
||||
this.assignNumJ = assignNumJ;
|
||||
}
|
||||
|
||||
public String getAssignNumJ()
|
||||
{
|
||||
return assignNumJ;
|
||||
}
|
||||
|
||||
public void setPrintDate(String printDate)
|
||||
{
|
||||
this.printDate = printDate;
|
||||
}
|
||||
|
||||
public String getPrintDate()
|
||||
{
|
||||
return printDate;
|
||||
}
|
||||
|
||||
public void setStockStatus(String stockStatus)
|
||||
{
|
||||
this.stockStatus = stockStatus;
|
||||
}
|
||||
|
||||
public String getStockStatus()
|
||||
{
|
||||
return stockStatus;
|
||||
}
|
||||
|
||||
public void setSupplierId(String supplierId)
|
||||
{
|
||||
this.supplierId = supplierId;
|
||||
}
|
||||
|
||||
public String getSupplierId()
|
||||
{
|
||||
return supplierId;
|
||||
}
|
||||
|
||||
public void setCustomerId(String customerId)
|
||||
{
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
public String getCustomerId()
|
||||
{
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setUnit(String unit)
|
||||
{
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit()
|
||||
{
|
||||
return unit;
|
||||
}
|
||||
|
||||
public void setSpec(String spec)
|
||||
{
|
||||
this.spec = spec;
|
||||
}
|
||||
|
||||
public String getSpec()
|
||||
{
|
||||
return spec;
|
||||
}
|
||||
|
||||
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 setScanNum(String scanNum)
|
||||
{
|
||||
this.scanNum = scanNum;
|
||||
}
|
||||
|
||||
public String getScanNum()
|
||||
{
|
||||
return scanNum;
|
||||
}
|
||||
|
||||
public void setScanNumX(String scanNumX)
|
||||
{
|
||||
this.scanNumX = scanNumX;
|
||||
}
|
||||
|
||||
public String getScanNumX()
|
||||
{
|
||||
return scanNumX;
|
||||
}
|
||||
|
||||
public void setScanNumJ(String scanNumJ)
|
||||
{
|
||||
this.scanNumJ = scanNumJ;
|
||||
}
|
||||
|
||||
public String getScanNumJ()
|
||||
{
|
||||
return scanNumJ;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockCheckDetailId", getStockCheckDetailId())
|
||||
.append("stockCheckGuid", getStockCheckGuid())
|
||||
.append("stockCheckId", getStockCheckId())
|
||||
.append("lotNo", getLotNo())
|
||||
.append("productGuid", getProductGuid())
|
||||
.append("productId", getProductId())
|
||||
.append("quantity", getQuantity())
|
||||
.append("quantityX", getQuantityX())
|
||||
.append("quantityJ", getQuantityJ())
|
||||
.append("price", getPrice())
|
||||
.append("cargoNo", getCargoNo())
|
||||
.append("remark", getRemark())
|
||||
.append("assignNum", getAssignNum())
|
||||
.append("assignNumX", getAssignNumX())
|
||||
.append("assignNumJ", getAssignNumJ())
|
||||
.append("printDate", getPrintDate())
|
||||
.append("stockStatus", getStockStatus())
|
||||
.append("supplierId", getSupplierId())
|
||||
.append("customerId", getCustomerId())
|
||||
.append("unit", getUnit())
|
||||
.append("spec", getSpec())
|
||||
.append("spare1", getSpare1())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare3", getSpare3())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare6", getSpare6())
|
||||
.append("scanNum", getScanNum())
|
||||
.append("scanNumX", getScanNumX())
|
||||
.append("scanNumJ", getScanNumJ())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheckdetailfinish.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
|
||||
|
||||
/**
|
||||
* 盘库历史单据子信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface CheckStockinDetailFinishMapper
|
||||
{
|
||||
/**
|
||||
* 查询盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库历史单据子信息主键
|
||||
* @return 盘库历史单据子信息
|
||||
*/
|
||||
public CheckStockinDetailFinish selectCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId);
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据子信息列表
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 盘库历史单据子信息集合
|
||||
*/
|
||||
public List<CheckStockinDetailFinish> selectCheckStockinDetailFinishList(CheckStockinDetailFinish checkStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据子信息
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockinDetailFinish(CheckStockinDetailFinish checkStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据子信息
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockinDetailFinish(CheckStockinDetailFinish checkStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库历史单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId);
|
||||
|
||||
/**
|
||||
* 批量删除盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailFinishByStockCheckDetailIds(String[] stockCheckDetailIds);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheckdetailfinish.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
|
||||
|
||||
/**
|
||||
* 盘库历史单据子信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface ICheckStockinDetailFinishService
|
||||
{
|
||||
/**
|
||||
* 查询盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库历史单据子信息主键
|
||||
* @return 盘库历史单据子信息
|
||||
*/
|
||||
public CheckStockinDetailFinish selectCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId);
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据子信息列表
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 盘库历史单据子信息集合
|
||||
*/
|
||||
public List<CheckStockinDetailFinish> selectCheckStockinDetailFinishList(CheckStockinDetailFinish checkStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据子信息
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockinDetailFinish(CheckStockinDetailFinish checkStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据子信息
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockinDetailFinish(CheckStockinDetailFinish checkStockinDetailFinish);
|
||||
|
||||
/**
|
||||
* 批量删除盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailIds 需要删除的盘库历史单据子信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailFinishByStockCheckDetailIds(String[] stockCheckDetailIds);
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据子信息信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库历史单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.ruoyi.check.stockcheckdetailfinish.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper;
|
||||
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
|
||||
import com.ruoyi.check.stockcheckdetailfinish.service.ICheckStockinDetailFinishService;
|
||||
|
||||
/**
|
||||
* 盘库历史单据子信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Service
|
||||
public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailFinishService
|
||||
{
|
||||
@Autowired
|
||||
private CheckStockinDetailFinishMapper checkStockinDetailFinishMapper;
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库历史单据子信息主键
|
||||
* @return 盘库历史单据子信息
|
||||
*/
|
||||
@Override
|
||||
public CheckStockinDetailFinish selectCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId)
|
||||
{
|
||||
return checkStockinDetailFinishMapper.selectCheckStockinDetailFinishByStockCheckDetailId(stockCheckDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据子信息列表
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 盘库历史单据子信息
|
||||
*/
|
||||
@Override
|
||||
public List<CheckStockinDetailFinish> selectCheckStockinDetailFinishList(CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
return checkStockinDetailFinishMapper.selectCheckStockinDetailFinishList(checkStockinDetailFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据子信息
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertCheckStockinDetailFinish(CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
return checkStockinDetailFinishMapper.insertCheckStockinDetailFinish(checkStockinDetailFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据子信息
|
||||
*
|
||||
* @param checkStockinDetailFinish 盘库历史单据子信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateCheckStockinDetailFinish(CheckStockinDetailFinish checkStockinDetailFinish)
|
||||
{
|
||||
return checkStockinDetailFinishMapper.updateCheckStockinDetailFinish(checkStockinDetailFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除盘库历史单据子信息
|
||||
*
|
||||
* @param stockCheckDetailIds 需要删除的盘库历史单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinDetailFinishByStockCheckDetailIds(String[] stockCheckDetailIds)
|
||||
{
|
||||
return checkStockinDetailFinishMapper.deleteCheckStockinDetailFinishByStockCheckDetailIds(stockCheckDetailIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据子信息信息
|
||||
*
|
||||
* @param stockCheckDetailId 盘库历史单据子信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId)
|
||||
{
|
||||
return checkStockinDetailFinishMapper.deleteCheckStockinDetailFinishByStockCheckDetailId(stockCheckDetailId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.ruoyi.check.stockcheckfinish.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.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.stockcheckfinish.domain.CheckStockinFinish;
|
||||
import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 盘库历史单据主信息Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/check/stockCheckFinish")
|
||||
public class CheckStockinFinishController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private ICheckStockinFinishService checkStockinFinishService;
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据主信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckFinish:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
startPage();
|
||||
List<CheckStockinFinish> list = checkStockinFinishService.selectCheckStockinFinishList(checkStockinFinish);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出盘库历史单据主信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckFinish:export')")
|
||||
@Log(title = "盘库历史单据主信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
List<CheckStockinFinish> list = checkStockinFinishService.selectCheckStockinFinishList(checkStockinFinish);
|
||||
ExcelUtil<CheckStockinFinish> util = new ExcelUtil<CheckStockinFinish>(CheckStockinFinish.class);
|
||||
util.exportExcel(response, list, "盘库历史单据主信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取盘库历史单据主信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckFinish:query')")
|
||||
@GetMapping(value = "/{stockGuid}")
|
||||
public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid)
|
||||
{
|
||||
return success(checkStockinFinishService.selectCheckStockinFinishByStockGuid(stockGuid));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckFinish:add')")
|
||||
@Log(title = "盘库历史单据主信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
return toAjax(checkStockinFinishService.insertCheckStockinFinish(checkStockinFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckFinish:edit')")
|
||||
@Log(title = "盘库历史单据主信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
return toAjax(checkStockinFinishService.updateCheckStockinFinish(checkStockinFinish));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据主信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('check:stockCheckFinish:remove')")
|
||||
@Log(title = "盘库历史单据主信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stockGuids}")
|
||||
public AjaxResult remove(@PathVariable String[] stockGuids)
|
||||
{
|
||||
return toAjax(checkStockinFinishService.deleteCheckStockinFinishByStockGuids(stockGuids));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,307 @@
|
||||
package com.ruoyi.check.stockcheckfinish.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_stockin_finish
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public class CheckStockinFinish extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** GUID */
|
||||
private String stockGuid;
|
||||
|
||||
/** 盘点单据ID */
|
||||
@Excel(name = "盘点单据ID")
|
||||
private String stockCheckId;
|
||||
|
||||
/** 盘库类型 */
|
||||
@Excel(name = "盘库类型")
|
||||
private String checkType;
|
||||
|
||||
/** 建立时间 */
|
||||
@Excel(name = "建立时间")
|
||||
private String createDate;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createManId;
|
||||
|
||||
/** 单据状态 */
|
||||
@Excel(name = "单据状态")
|
||||
private String status;
|
||||
|
||||
/** 仓库ID */
|
||||
@Excel(name = "仓库ID")
|
||||
private String warehouseId;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String spare3;
|
||||
|
||||
/** 完成日期 */
|
||||
@Excel(name = " 完成日期")
|
||||
private String finishDate;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** erp单号 */
|
||||
@Excel(name = "erp单号")
|
||||
private String erpBill;
|
||||
|
||||
/** 单据来源 */
|
||||
@Excel(name = "单据来源")
|
||||
private String stockSource;
|
||||
|
||||
/** 部门编码 */
|
||||
@Excel(name = "部门编码")
|
||||
private String departmentNo;
|
||||
|
||||
/** 客户编码 */
|
||||
@Excel(name = "客户编码")
|
||||
private String customerNo;
|
||||
|
||||
/** 班组编码 */
|
||||
@Excel(name = "班组编码")
|
||||
private String classNo;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierNo;
|
||||
|
||||
public void setStockGuid(String stockGuid)
|
||||
{
|
||||
this.stockGuid = stockGuid;
|
||||
}
|
||||
|
||||
public String getStockGuid()
|
||||
{
|
||||
return stockGuid;
|
||||
}
|
||||
|
||||
public void setStockCheckId(String stockCheckId)
|
||||
{
|
||||
this.stockCheckId = stockCheckId;
|
||||
}
|
||||
|
||||
public String getStockCheckId()
|
||||
{
|
||||
return stockCheckId;
|
||||
}
|
||||
|
||||
public void setCheckType(String checkType)
|
||||
{
|
||||
this.checkType = checkType;
|
||||
}
|
||||
|
||||
public String getCheckType()
|
||||
{
|
||||
return checkType;
|
||||
}
|
||||
|
||||
public void setCreateDate(String createDate)
|
||||
{
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
public String getCreateDate()
|
||||
{
|
||||
return createDate;
|
||||
}
|
||||
|
||||
public void setCreateManId(String createManId)
|
||||
{
|
||||
this.createManId = createManId;
|
||||
}
|
||||
|
||||
public String getCreateManId()
|
||||
{
|
||||
return createManId;
|
||||
}
|
||||
|
||||
public void setStatus(String status)
|
||||
{
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus()
|
||||
{
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setSpare5(String spare5)
|
||||
{
|
||||
this.spare5 = spare5;
|
||||
}
|
||||
|
||||
public String getSpare5()
|
||||
{
|
||||
return spare5;
|
||||
}
|
||||
|
||||
public void setSpare4(String spare4)
|
||||
{
|
||||
this.spare4 = spare4;
|
||||
}
|
||||
|
||||
public String getSpare4()
|
||||
{
|
||||
return spare4;
|
||||
}
|
||||
|
||||
public void setSpare3(String spare3)
|
||||
{
|
||||
this.spare3 = spare3;
|
||||
}
|
||||
|
||||
public String getSpare3()
|
||||
{
|
||||
return spare3;
|
||||
}
|
||||
|
||||
public void setFinishDate(String finishDate)
|
||||
{
|
||||
this.finishDate = finishDate;
|
||||
}
|
||||
|
||||
public String getFinishDate()
|
||||
{
|
||||
return finishDate;
|
||||
}
|
||||
|
||||
public void setSpare2(String spare2)
|
||||
{
|
||||
this.spare2 = spare2;
|
||||
}
|
||||
|
||||
public String getSpare2()
|
||||
{
|
||||
return spare2;
|
||||
}
|
||||
|
||||
public void setSpare1(String spare1)
|
||||
{
|
||||
this.spare1 = spare1;
|
||||
}
|
||||
|
||||
public String getSpare1()
|
||||
{
|
||||
return spare1;
|
||||
}
|
||||
|
||||
public void setErpBill(String erpBill)
|
||||
{
|
||||
this.erpBill = erpBill;
|
||||
}
|
||||
|
||||
public String getErpBill()
|
||||
{
|
||||
return erpBill;
|
||||
}
|
||||
|
||||
public void setStockSource(String stockSource)
|
||||
{
|
||||
this.stockSource = stockSource;
|
||||
}
|
||||
|
||||
public String getStockSource()
|
||||
{
|
||||
return stockSource;
|
||||
}
|
||||
|
||||
public void setDepartmentNo(String departmentNo)
|
||||
{
|
||||
this.departmentNo = departmentNo;
|
||||
}
|
||||
|
||||
public String getDepartmentNo()
|
||||
{
|
||||
return departmentNo;
|
||||
}
|
||||
|
||||
public void setCustomerNo(String customerNo)
|
||||
{
|
||||
this.customerNo = customerNo;
|
||||
}
|
||||
|
||||
public String getCustomerNo()
|
||||
{
|
||||
return customerNo;
|
||||
}
|
||||
|
||||
public void setClassNo(String classNo)
|
||||
{
|
||||
this.classNo = classNo;
|
||||
}
|
||||
|
||||
public String getClassNo()
|
||||
{
|
||||
return classNo;
|
||||
}
|
||||
|
||||
public void setSupplierNo(String supplierNo)
|
||||
{
|
||||
this.supplierNo = supplierNo;
|
||||
}
|
||||
|
||||
public String getSupplierNo()
|
||||
{
|
||||
return supplierNo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("stockGuid", getStockGuid())
|
||||
.append("stockCheckId", getStockCheckId())
|
||||
.append("checkType", getCheckType())
|
||||
.append("createDate", getCreateDate())
|
||||
.append("createManId", getCreateManId())
|
||||
.append("status", getStatus())
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("spare5", getSpare5())
|
||||
.append("spare4", getSpare4())
|
||||
.append("spare3", getSpare3())
|
||||
.append("finishDate", getFinishDate())
|
||||
.append("spare2", getSpare2())
|
||||
.append("spare1", getSpare1())
|
||||
.append("erpBill", getErpBill())
|
||||
.append("stockSource", getStockSource())
|
||||
.append("departmentNo", getDepartmentNo())
|
||||
.append("customerNo", getCustomerNo())
|
||||
.append("classNo", getClassNo())
|
||||
.append("supplierNo", getSupplierNo())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheckfinish.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
|
||||
|
||||
/**
|
||||
* 盘库历史单据主信息Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface CheckStockinFinishMapper
|
||||
{
|
||||
/**
|
||||
* 查询盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库历史单据主信息主键
|
||||
* @return 盘库历史单据主信息
|
||||
*/
|
||||
public CheckStockinFinish selectCheckStockinFinishByStockGuid(String stockGuid);
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据主信息列表
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 盘库历史单据主信息集合
|
||||
*/
|
||||
public List<CheckStockinFinish> selectCheckStockinFinishList(CheckStockinFinish checkStockinFinish);
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据主信息
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockinFinish(CheckStockinFinish checkStockinFinish);
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据主信息
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockinFinish(CheckStockinFinish checkStockinFinish);
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库历史单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinFinishByStockGuid(String stockGuid);
|
||||
|
||||
/**
|
||||
* 批量删除盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinFinishByStockGuids(String[] stockGuids);
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.ruoyi.check.stockcheckfinish.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
|
||||
|
||||
/**
|
||||
* 盘库历史单据主信息Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
public interface ICheckStockinFinishService
|
||||
{
|
||||
/**
|
||||
* 查询盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库历史单据主信息主键
|
||||
* @return 盘库历史单据主信息
|
||||
*/
|
||||
public CheckStockinFinish selectCheckStockinFinishByStockGuid(String stockGuid);
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据主信息列表
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 盘库历史单据主信息集合
|
||||
*/
|
||||
public List<CheckStockinFinish> selectCheckStockinFinishList(CheckStockinFinish checkStockinFinish);
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据主信息
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertCheckStockinFinish(CheckStockinFinish checkStockinFinish);
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据主信息
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateCheckStockinFinish(CheckStockinFinish checkStockinFinish);
|
||||
|
||||
/**
|
||||
* 批量删除盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuids 需要删除的盘库历史单据主信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinFinishByStockGuids(String[] stockGuids);
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据主信息信息
|
||||
*
|
||||
* @param stockGuid 盘库历史单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteCheckStockinFinishByStockGuid(String stockGuid);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.ruoyi.check.stockcheckfinish.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper;
|
||||
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
|
||||
import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
|
||||
|
||||
/**
|
||||
* 盘库历史单据主信息Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-29
|
||||
*/
|
||||
@Service
|
||||
public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
|
||||
{
|
||||
@Autowired
|
||||
private CheckStockinFinishMapper checkStockinFinishMapper;
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuid 盘库历史单据主信息主键
|
||||
* @return 盘库历史单据主信息
|
||||
*/
|
||||
@Override
|
||||
public CheckStockinFinish selectCheckStockinFinishByStockGuid(String stockGuid)
|
||||
{
|
||||
return checkStockinFinishMapper.selectCheckStockinFinishByStockGuid(stockGuid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询盘库历史单据主信息列表
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 盘库历史单据主信息
|
||||
*/
|
||||
@Override
|
||||
public List<CheckStockinFinish> selectCheckStockinFinishList(CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
return checkStockinFinishMapper.selectCheckStockinFinishList(checkStockinFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增盘库历史单据主信息
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertCheckStockinFinish(CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
return checkStockinFinishMapper.insertCheckStockinFinish(checkStockinFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改盘库历史单据主信息
|
||||
*
|
||||
* @param checkStockinFinish 盘库历史单据主信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateCheckStockinFinish(CheckStockinFinish checkStockinFinish)
|
||||
{
|
||||
return checkStockinFinishMapper.updateCheckStockinFinish(checkStockinFinish);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除盘库历史单据主信息
|
||||
*
|
||||
* @param stockGuids 需要删除的盘库历史单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinFinishByStockGuids(String[] stockGuids)
|
||||
{
|
||||
return checkStockinFinishMapper.deleteCheckStockinFinishByStockGuids(stockGuids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除盘库历史单据主信息信息
|
||||
*
|
||||
* @param stockGuid 盘库历史单据主信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteCheckStockinFinishByStockGuid(String stockGuid)
|
||||
{
|
||||
return checkStockinFinishMapper.deleteCheckStockinFinishByStockGuid(stockGuid);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.in.stockindetail.domain;
|
||||
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -135,4 +136,6 @@ public class InStockinDetail extends BaseEntity
|
||||
|
||||
private String status;
|
||||
|
||||
private ExtraField extraField;
|
||||
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import com.ruoyi.in.stockin.domain.InStockin;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -44,7 +46,11 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
|
||||
@Override
|
||||
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail)
|
||||
{
|
||||
return inStockinDetailMapper.selectInStockinDetailList(inStockinDetail);
|
||||
List<InStockinDetail> inStockinDetails = inStockinDetailMapper.selectInStockinDetailList(inStockinDetail);
|
||||
for (InStockinDetail res : inStockinDetails) {
|
||||
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
|
||||
}
|
||||
return inStockinDetails;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -2,6 +2,8 @@ package com.ruoyi.in.stockindetailfinish.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -95,6 +97,11 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
|
||||
|
||||
@Override
|
||||
public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail) {
|
||||
return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
|
||||
List<InStockinDetail> inStockinDetails = inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
|
||||
for (InStockinDetail res : inStockinDetails) {
|
||||
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
|
||||
}
|
||||
return inStockinDetails;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -13,15 +13,69 @@ import javax.validation.constraints.NotEmpty;
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class ReceiveProductVo {
|
||||
@Excel(name = "序号")
|
||||
private String seqNo;
|
||||
|
||||
@Excel(name = "子件")
|
||||
private String subItem;
|
||||
|
||||
@Excel(name = "物料编码")
|
||||
@NotEmpty(message = "物料GUID不能为空")
|
||||
private String productGuid;
|
||||
@Excel(name = "物料数量")
|
||||
private String productId;
|
||||
|
||||
@Excel(name = "物料描述")
|
||||
private String materialDesc;
|
||||
|
||||
@Excel(name = "英文描述")
|
||||
private String englishDesc;
|
||||
|
||||
@Excel(name = "数量")
|
||||
@NotEmpty(message = "物料数量不能为空")
|
||||
private String quantity;
|
||||
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
@Excel(name = "单件净重Unit Net Weight")
|
||||
private String unitNetWeight;
|
||||
|
||||
@Excel(name = "总净重Total Net Weight")
|
||||
private String totalNetWeight;
|
||||
|
||||
@Excel(name = "箱号Carton NO.")
|
||||
private String cartonNo;
|
||||
|
||||
@Excel(name = "包装方式")
|
||||
private String packingMethod;
|
||||
|
||||
@Excel(name = "长(MM)")
|
||||
private String length;
|
||||
|
||||
@Excel(name = "宽(MM)")
|
||||
private String width;
|
||||
|
||||
@Excel(name = "高(MM)")
|
||||
private String height;
|
||||
|
||||
@Excel(name = "体积m³")
|
||||
private String volume;
|
||||
|
||||
@Excel(name = "净重(KG)NET WEIGHT")
|
||||
private String netWeight;
|
||||
|
||||
@Excel(name = "毛重(KG)GROSS WEIGHT")
|
||||
private String grossWeight;
|
||||
|
||||
@Excel(name = "单价")
|
||||
private String unitPrice;
|
||||
|
||||
@Excel(name = "总价")
|
||||
private String totalPrice;
|
||||
|
||||
@Excel(name = "备注")
|
||||
private String remark;
|
||||
|
||||
@Excel(name = "批次号")
|
||||
@NotEmpty(message = "批次号不能为空")
|
||||
private String lotNo;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -11,10 +11,12 @@ import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.bas.BasProduct.domain.BasProduct;
|
||||
import com.ruoyi.bas.BasProduct.service.IBasProductService;
|
||||
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.uuid.IdUtils;
|
||||
import com.ruoyi.in.stockin.domain.InStockin;
|
||||
@@ -108,25 +110,17 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
|
||||
receiveStockinMapper.insertReceiveStockin(receiveStockin);
|
||||
int i = 1;
|
||||
for (ReceiveProductVo receiveProductVo : productVoList) {
|
||||
BasProduct basProduct = iBasProductService.selectBasProductByProductGuid(receiveProductVo.getProductGuid());
|
||||
BasProduct basProduct = iBasProductService.selectBasProductByProductId(receiveProductVo.getProductId());
|
||||
ReceiveStockinDetail receiveStockinDetail = new ReceiveStockinDetail();
|
||||
receiveStockinDetail.setQuantity(receiveProductVo.getQuantity());
|
||||
receiveStockinDetail.setProductGuid(receiveProductVo.getProductGuid());
|
||||
receiveStockinDetail.setProductGuid(receiveProductVo.getProductId());
|
||||
receiveStockinDetail.setProductId(basProduct.getProductId());
|
||||
receiveStockinDetail.setStockinGuid(receiveStockin.getStockinGuid());
|
||||
receiveStockinDetail.setStockinId(receiveStockin.getStockinId());
|
||||
receiveStockinDetail.setStockinDetailId(receiveStockin.getStockinId()+"-"+i++);
|
||||
receiveStockinDetail.setUnit(basProduct.getUnit());
|
||||
receiveStockinDetail.setSpec(basProduct.getSpec());
|
||||
receiveStockinDetail.setSpare1(basProduct.getSpare1());
|
||||
receiveStockinDetail.setSpare2(basProduct.getSpare2());
|
||||
receiveStockinDetail.setSpare3(basProduct.getSpare3());
|
||||
receiveStockinDetail.setSpare4(basProduct.getSpare4());
|
||||
receiveStockinDetail.setSpare5(basProduct.getSpare5());
|
||||
receiveStockinDetail.setSpare6(basProduct.getSpare6());
|
||||
receiveStockinDetail.setCargoNo(basProduct.getCargoNo());
|
||||
receiveStockinDetail.setPrice(basProduct.getPrice());
|
||||
receiveStockinDetail.setRemark(basProduct.getRemark());
|
||||
receiveStockinDetail.setStockinGuid(receiveStockin.getStockinGuid());
|
||||
ExtraField extraField = new ExtraField();
|
||||
BeanUtil.copyProperties(receiveProductVo,extraField);
|
||||
receiveStockinDetail.setSpare1(JSONUtil.toJsonStr(extraField));
|
||||
receiveStockinDetail.setStockStatus("0");
|
||||
receiveStockinDetail.setLotNo(receiveProductVo.getLotNo());
|
||||
iReceiveStockinDetailService.insertReceiveStockinDetail(receiveStockinDetail);
|
||||
@@ -179,10 +173,10 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
|
||||
if (CollUtil.isEmpty(list)){
|
||||
return AjaxResult.error("导入数据为空");
|
||||
}
|
||||
List<String> collect = list.stream().map(ReceiveProductVo::getProductGuid).collect(Collectors.toList());
|
||||
List<BasProduct> result = iBasProductService.selectBasProductListByProductGuids(collect);
|
||||
List<String> collect = list.stream().map(ReceiveProductVo::getProductId).collect(Collectors.toList());
|
||||
List<BasProduct> result = iBasProductService.selectBasProductListByProductIds(collect);
|
||||
for (BasProduct basProduct : result) {
|
||||
Optional<ReceiveProductVo> first = list.stream().filter(x -> x.getProductGuid().equals(basProduct.getProductGuid())).findFirst();
|
||||
Optional<ReceiveProductVo> first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductGuid())).findFirst();
|
||||
first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity()));
|
||||
first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo()));
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.receive.stockindetail.domain;
|
||||
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -127,4 +128,8 @@ public class ReceiveStockinDetail extends BaseEntity
|
||||
private String spare6;
|
||||
|
||||
private String status;
|
||||
/**
|
||||
* 扩展字段
|
||||
*/
|
||||
private ExtraField extraField;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,9 @@ package com.ruoyi.receive.stockindetail.service.impl;
|
||||
import java.util.List;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockDetailQualityInsVo;
|
||||
import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -46,7 +48,11 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
|
||||
@Override
|
||||
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail)
|
||||
{
|
||||
return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
for (ReceiveStockinDetail stockinDetail : receiveStockinDetails) {
|
||||
stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class));
|
||||
}
|
||||
return receiveStockinDetails;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -2,6 +2,9 @@ package com.ruoyi.receive.stockindetailfinish.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
|
||||
import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -95,6 +98,10 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
|
||||
|
||||
@Override
|
||||
public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
|
||||
return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
List<ReceiveStockinDetail> receiveStockinDetails = receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
|
||||
for (ReceiveStockinDetail res : receiveStockinDetails) {
|
||||
res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class));
|
||||
}
|
||||
return receiveStockinDetails;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,11 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<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="productName" column="product_name" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBasProductVo">
|
||||
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name from bas_product
|
||||
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9 from bas_product
|
||||
</sql>
|
||||
|
||||
<select id="selectBasProductList" parameterType="BasProduct" resultMap="BasProductResult">
|
||||
@@ -42,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
|
||||
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
|
||||
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
|
||||
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
|
||||
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
|
||||
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
|
||||
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
@@ -57,6 +63,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
#{productGuid}
|
||||
</foreach>
|
||||
</select>
|
||||
<select id="selectBasProductByProductId" resultType="com.ruoyi.bas.BasProduct.domain.BasProduct">
|
||||
<include refid="selectBasProductVo"/>
|
||||
where product_id = #{productId}
|
||||
</select>
|
||||
<select id="selectBasProductListByProductIds" resultType="com.ruoyi.bas.BasProduct.domain.BasProduct">
|
||||
<include refid="selectBasProductVo"/>
|
||||
where product_id in
|
||||
<foreach collection="productIds" item="productId" open="(" separator="," close=")">
|
||||
#{productId}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<insert id="insertBasProduct" parameterType="BasProduct">
|
||||
insert into bas_product
|
||||
@@ -75,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<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="productName != null and productName != ''">product_name,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
@@ -92,6 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<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="productName != null and productName != ''">#{productName},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
@@ -112,6 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<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="productName != null and productName != ''">product_name = #{productName},</if>
|
||||
</trim>
|
||||
where product_guid = #{productGuid}
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
<?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.bas.port.mapper.BasProductPortMapper">
|
||||
|
||||
<resultMap type="BasProductPort" id="BasProductPortResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="portName" column="port_name" />
|
||||
<result property="portType" column="port_type" />
|
||||
<result property="portDesc" column="port_desc" />
|
||||
<result property="createMan" column="create_man" />
|
||||
<result property="createTime" column="create_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBasProductPortVo">
|
||||
select id, port_name, port_type, port_desc, create_man, create_time from bas_product_port
|
||||
</sql>
|
||||
|
||||
<select id="selectBasProductPortList" parameterType="BasProductPort" resultMap="BasProductPortResult">
|
||||
<include refid="selectBasProductPortVo"/>
|
||||
<where>
|
||||
<if test="portName != null and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
|
||||
<if test="portType != null and portType != ''"> and port_type = #{portType}</if>
|
||||
<if test="portDesc != null and portDesc != ''"> and port_desc = #{portDesc}</if>
|
||||
<if test="createMan != null and createMan != ''"> and create_man = #{createMan}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectBasProductPortById" parameterType="String" resultMap="BasProductPortResult">
|
||||
<include refid="selectBasProductPortVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertBasProductPort" parameterType="BasProductPort">
|
||||
insert into bas_product_port
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="portName != null">port_name,</if>
|
||||
<if test="portType != null">port_type,</if>
|
||||
<if test="portDesc != null">port_desc,</if>
|
||||
<if test="createMan != null">create_man,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="portName != null">#{portName},</if>
|
||||
<if test="portType != null">#{portType},</if>
|
||||
<if test="portDesc != null">#{portDesc},</if>
|
||||
<if test="createMan != null">#{createMan},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateBasProductPort" parameterType="BasProductPort">
|
||||
update bas_product_port
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="portName != null">port_name = #{portName},</if>
|
||||
<if test="portType != null">port_type = #{portType},</if>
|
||||
<if test="portDesc != null">port_desc = #{portDesc},</if>
|
||||
<if test="createMan != null">create_man = #{createMan},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteBasProductPortById" parameterType="String">
|
||||
delete from bas_product_port where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteBasProductPortByIds" parameterType="String">
|
||||
delete from bas_product_port where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -0,0 +1,114 @@
|
||||
<?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.bas.portrel.mapper.BasProductPortRelMapper">
|
||||
|
||||
<resultMap type="BasProductPortRel" id="BasProductPortRelResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="productGuid" column="product_guid" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="portId" column="port_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBasProductPortRelVo">
|
||||
select id, product_guid, product_id, port_id from bas_product_port_rel
|
||||
</sql>
|
||||
|
||||
<resultMap type="BasProduct" id="BasProductResult">
|
||||
<result property="productGuid" column="product_guid" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="parentId" column="parent_id" />
|
||||
<result property="price" column="price" />
|
||||
<result property="cargoNo" column="cargo_no" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="spec" column="spec" />
|
||||
<result property="remark" column="remark" />
|
||||
<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="productName" column="product_name" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBasProductVo">
|
||||
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name from bas_product
|
||||
</sql>
|
||||
|
||||
<select id="selectBasProductPortRelList" parameterType="BasProductPortRel" resultMap="BasProductPortRelResult">
|
||||
<include refid="selectBasProductPortRelVo"/>
|
||||
<where>
|
||||
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="portId != null and portId != ''"> and port_id = #{portId}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectBasProductPortRelById" parameterType="Long" resultMap="BasProductPortRelResult">
|
||||
<include refid="selectBasProductPortRelVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
<select id="selectNotBindProduct" resultMap="BasProductResult">
|
||||
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9
|
||||
from bas_product bp
|
||||
<where>
|
||||
<if test="bindStatus =='1'.toString()">
|
||||
and product_id in (select product_id from bas_product_port_rel where port_id=#{portId})
|
||||
</if>
|
||||
<if test="bindStatus =='0'.toString()">
|
||||
and product_id not in (select product_id from bas_product_port_rel where port_id=#{portId})
|
||||
</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
|
||||
</where>
|
||||
|
||||
</select>
|
||||
|
||||
<insert id="insertBasProductPortRel" parameterType="BasProductPortRel">
|
||||
insert into bas_product_port_rel
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="productGuid != null">product_guid,</if>
|
||||
<if test="productId != null">product_id,</if>
|
||||
<if test="portId != null">port_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="productGuid != null">#{productGuid},</if>
|
||||
<if test="productId != null">#{productId},</if>
|
||||
<if test="portId != null">#{portId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateBasProductPortRel" parameterType="BasProductPortRel">
|
||||
update bas_product_port_rel
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="productGuid != null">product_guid = #{productGuid},</if>
|
||||
<if test="productId != null">product_id = #{productId},</if>
|
||||
<if test="portId != null">port_id = #{portId},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteBasProductPortRelById" parameterType="Long">
|
||||
delete from bas_product_port_rel where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteBasProductPortRelByIds" parameterType="String">
|
||||
delete from bas_product_port_rel where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
<delete id="deleteBasProductPortRel">
|
||||
delete from bas_product_port_rel where port_id=#{portId} and product_id in
|
||||
<foreach item="productId" collection="productIds" open="(" separator="," close=")">
|
||||
#{productId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -0,0 +1,197 @@
|
||||
<?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.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper">
|
||||
|
||||
<resultMap type="CheckStockinDetailFinish" id="CheckStockinDetailFinishResult">
|
||||
<result property="stockCheckDetailId" column="stock_check_detail_id" />
|
||||
<result property="stockCheckGuid" column="stock_check_guid" />
|
||||
<result property="stockCheckId" column="stock_check_id" />
|
||||
<result property="lotNo" column="lot_no" />
|
||||
<result property="productGuid" column="product_guid" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="quantity" column="quantity" />
|
||||
<result property="quantityX" column="quantity_x" />
|
||||
<result property="quantityJ" column="quantity_j" />
|
||||
<result property="price" column="price" />
|
||||
<result property="cargoNo" column="cargo_no" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="assignNum" column="assign_num" />
|
||||
<result property="assignNumX" column="assign_num_x" />
|
||||
<result property="assignNumJ" column="assign_num_j" />
|
||||
<result property="printDate" column="print_date" />
|
||||
<result property="stockStatus" column="stock_status" />
|
||||
<result property="supplierId" column="supplier_id" />
|
||||
<result property="customerId" column="customer_id" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="spec" column="spec" />
|
||||
<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="scanNum" column="scan_num" />
|
||||
<result property="scanNumX" column="scan_num_x" />
|
||||
<result property="scanNumJ" column="scan_num_j" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectCheckStockinDetailFinishVo">
|
||||
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish
|
||||
</sql>
|
||||
|
||||
<select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult">
|
||||
<include refid="selectCheckStockinDetailFinishVo"/>
|
||||
<where>
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
|
||||
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
|
||||
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
|
||||
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
|
||||
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
|
||||
<if test="price != null and price != ''"> and price = #{price}</if>
|
||||
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
|
||||
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
|
||||
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
|
||||
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
|
||||
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
|
||||
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
|
||||
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
|
||||
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
|
||||
<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="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
|
||||
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
|
||||
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectCheckStockinDetailFinishByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailFinishResult">
|
||||
<include refid="selectCheckStockinDetailFinishVo"/>
|
||||
where stock_check_detail_id = #{stockCheckDetailId}
|
||||
</select>
|
||||
|
||||
<insert id="insertCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
|
||||
insert into check_stockin_detail_finish
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="stockCheckDetailId != null">stock_check_detail_id,</if>
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid,</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
|
||||
<if test="lotNo != null and lotNo != ''">lot_no,</if>
|
||||
<if test="productGuid != null">product_guid,</if>
|
||||
<if test="productId != null and productId != ''">product_id,</if>
|
||||
<if test="quantity != null">quantity,</if>
|
||||
<if test="quantityX != null">quantity_x,</if>
|
||||
<if test="quantityJ != null">quantity_j,</if>
|
||||
<if test="price != null">price,</if>
|
||||
<if test="cargoNo != null">cargo_no,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="assignNum != null">assign_num,</if>
|
||||
<if test="assignNumX != null">assign_num_x,</if>
|
||||
<if test="assignNumJ != null">assign_num_j,</if>
|
||||
<if test="printDate != null">print_date,</if>
|
||||
<if test="stockStatus != null">stock_status,</if>
|
||||
<if test="supplierId != null">supplier_id,</if>
|
||||
<if test="customerId != null">customer_id,</if>
|
||||
<if test="unit != null">unit,</if>
|
||||
<if test="spec != null">spec,</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="scanNum != null">scan_num,</if>
|
||||
<if test="scanNumX != null">scan_num_x,</if>
|
||||
<if test="scanNumJ != null">scan_num_j,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''">#{stockCheckGuid},</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
|
||||
<if test="lotNo != null and lotNo != ''">#{lotNo},</if>
|
||||
<if test="productGuid != null">#{productGuid},</if>
|
||||
<if test="productId != null and productId != ''">#{productId},</if>
|
||||
<if test="quantity != null">#{quantity},</if>
|
||||
<if test="quantityX != null">#{quantityX},</if>
|
||||
<if test="quantityJ != null">#{quantityJ},</if>
|
||||
<if test="price != null">#{price},</if>
|
||||
<if test="cargoNo != null">#{cargoNo},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="assignNum != null">#{assignNum},</if>
|
||||
<if test="assignNumX != null">#{assignNumX},</if>
|
||||
<if test="assignNumJ != null">#{assignNumJ},</if>
|
||||
<if test="printDate != null">#{printDate},</if>
|
||||
<if test="stockStatus != null">#{stockStatus},</if>
|
||||
<if test="supplierId != null">#{supplierId},</if>
|
||||
<if test="customerId != null">#{customerId},</if>
|
||||
<if test="unit != null">#{unit},</if>
|
||||
<if test="spec != null">#{spec},</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="scanNum != null">#{scanNum},</if>
|
||||
<if test="scanNumX != null">#{scanNumX},</if>
|
||||
<if test="scanNumJ != null">#{scanNumJ},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
|
||||
update check_stockin_detail_finish
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid = #{stockCheckGuid},</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
|
||||
<if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
|
||||
<if test="productGuid != null">product_guid = #{productGuid},</if>
|
||||
<if test="productId != null and productId != ''">product_id = #{productId},</if>
|
||||
<if test="quantity != null">quantity = #{quantity},</if>
|
||||
<if test="quantityX != null">quantity_x = #{quantityX},</if>
|
||||
<if test="quantityJ != null">quantity_j = #{quantityJ},</if>
|
||||
<if test="price != null">price = #{price},</if>
|
||||
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="assignNum != null">assign_num = #{assignNum},</if>
|
||||
<if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
|
||||
<if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
|
||||
<if test="printDate != null">print_date = #{printDate},</if>
|
||||
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
|
||||
<if test="supplierId != null">supplier_id = #{supplierId},</if>
|
||||
<if test="customerId != null">customer_id = #{customerId},</if>
|
||||
<if test="unit != null">unit = #{unit},</if>
|
||||
<if test="spec != null">spec = #{spec},</if>
|
||||
<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="scanNum != null">scan_num = #{scanNum},</if>
|
||||
<if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
|
||||
<if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
|
||||
</trim>
|
||||
where stock_check_detail_id = #{stockCheckDetailId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteCheckStockinDetailFinishByStockCheckDetailId" parameterType="String">
|
||||
delete from check_stockin_detail_finish where stock_check_detail_id = #{stockCheckDetailId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteCheckStockinDetailFinishByStockCheckDetailIds" parameterType="String">
|
||||
delete from check_stockin_detail_finish where stock_check_detail_id in
|
||||
<foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
|
||||
#{stockCheckDetailId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -0,0 +1,197 @@
|
||||
<?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.stockcheckdetail.mapper.CheckStockinDetailMapper">
|
||||
|
||||
<resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
|
||||
<result property="stockCheckDetailId" column="stock_check_detail_id" />
|
||||
<result property="stockCheckGuid" column="stock_check_guid" />
|
||||
<result property="stockCheckId" column="stock_check_id" />
|
||||
<result property="lotNo" column="lot_no" />
|
||||
<result property="productGuid" column="product_guid" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="quantity" column="quantity" />
|
||||
<result property="quantityX" column="quantity_x" />
|
||||
<result property="quantityJ" column="quantity_j" />
|
||||
<result property="price" column="price" />
|
||||
<result property="cargoNo" column="cargo_no" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="assignNum" column="assign_num" />
|
||||
<result property="assignNumX" column="assign_num_x" />
|
||||
<result property="assignNumJ" column="assign_num_j" />
|
||||
<result property="printDate" column="print_date" />
|
||||
<result property="stockStatus" column="stock_status" />
|
||||
<result property="supplierId" column="supplier_id" />
|
||||
<result property="customerId" column="customer_id" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="spec" column="spec" />
|
||||
<result property="scanNum" column="scan_num" />
|
||||
<result property="scanNumX" column="scan_num_x" />
|
||||
<result property="scanNumJ" column="scan_num_j" />
|
||||
<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" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectCheckStockinDetailVo">
|
||||
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail
|
||||
</sql>
|
||||
|
||||
<select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
|
||||
<include refid="selectCheckStockinDetailVo"/>
|
||||
<where>
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
|
||||
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
|
||||
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
|
||||
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
|
||||
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
|
||||
<if test="price != null and price != ''"> and price = #{price}</if>
|
||||
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
|
||||
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
|
||||
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
|
||||
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
|
||||
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
|
||||
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
|
||||
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
|
||||
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
|
||||
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
|
||||
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
|
||||
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
|
||||
<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>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectCheckStockinDetailByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailResult">
|
||||
<include refid="selectCheckStockinDetailVo"/>
|
||||
where stock_check_detail_id = #{stockCheckDetailId}
|
||||
</select>
|
||||
|
||||
<insert id="insertCheckStockinDetail" parameterType="CheckStockinDetail">
|
||||
insert into check_stockin_detail
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="stockCheckDetailId != null">stock_check_detail_id,</if>
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid,</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
|
||||
<if test="lotNo != null and lotNo != ''">lot_no,</if>
|
||||
<if test="productGuid != null">product_guid,</if>
|
||||
<if test="productId != null and productId != ''">product_id,</if>
|
||||
<if test="quantity != null">quantity,</if>
|
||||
<if test="quantityX != null">quantity_x,</if>
|
||||
<if test="quantityJ != null">quantity_j,</if>
|
||||
<if test="price != null">price,</if>
|
||||
<if test="cargoNo != null">cargo_no,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="assignNum != null">assign_num,</if>
|
||||
<if test="assignNumX != null">assign_num_x,</if>
|
||||
<if test="assignNumJ != null">assign_num_j,</if>
|
||||
<if test="printDate != null">print_date,</if>
|
||||
<if test="stockStatus != null">stock_status,</if>
|
||||
<if test="supplierId != null">supplier_id,</if>
|
||||
<if test="customerId != null">customer_id,</if>
|
||||
<if test="unit != null">unit,</if>
|
||||
<if test="spec != null">spec,</if>
|
||||
<if test="scanNum != null">scan_num,</if>
|
||||
<if test="scanNumX != null">scan_num_x,</if>
|
||||
<if test="scanNumJ != null">scan_num_j,</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>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''">#{stockCheckGuid},</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
|
||||
<if test="lotNo != null and lotNo != ''">#{lotNo},</if>
|
||||
<if test="productGuid != null">#{productGuid},</if>
|
||||
<if test="productId != null and productId != ''">#{productId},</if>
|
||||
<if test="quantity != null">#{quantity},</if>
|
||||
<if test="quantityX != null">#{quantityX},</if>
|
||||
<if test="quantityJ != null">#{quantityJ},</if>
|
||||
<if test="price != null">#{price},</if>
|
||||
<if test="cargoNo != null">#{cargoNo},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="assignNum != null">#{assignNum},</if>
|
||||
<if test="assignNumX != null">#{assignNumX},</if>
|
||||
<if test="assignNumJ != null">#{assignNumJ},</if>
|
||||
<if test="printDate != null">#{printDate},</if>
|
||||
<if test="stockStatus != null">#{stockStatus},</if>
|
||||
<if test="supplierId != null">#{supplierId},</if>
|
||||
<if test="customerId != null">#{customerId},</if>
|
||||
<if test="unit != null">#{unit},</if>
|
||||
<if test="spec != null">#{spec},</if>
|
||||
<if test="scanNum != null">#{scanNum},</if>
|
||||
<if test="scanNumX != null">#{scanNumX},</if>
|
||||
<if test="scanNumJ != null">#{scanNumJ},</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>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateCheckStockinDetail" parameterType="CheckStockinDetail">
|
||||
update check_stockin_detail
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid = #{stockCheckGuid},</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
|
||||
<if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
|
||||
<if test="productGuid != null">product_guid = #{productGuid},</if>
|
||||
<if test="productId != null and productId != ''">product_id = #{productId},</if>
|
||||
<if test="quantity != null">quantity = #{quantity},</if>
|
||||
<if test="quantityX != null">quantity_x = #{quantityX},</if>
|
||||
<if test="quantityJ != null">quantity_j = #{quantityJ},</if>
|
||||
<if test="price != null">price = #{price},</if>
|
||||
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="assignNum != null">assign_num = #{assignNum},</if>
|
||||
<if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
|
||||
<if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
|
||||
<if test="printDate != null">print_date = #{printDate},</if>
|
||||
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
|
||||
<if test="supplierId != null">supplier_id = #{supplierId},</if>
|
||||
<if test="customerId != null">customer_id = #{customerId},</if>
|
||||
<if test="unit != null">unit = #{unit},</if>
|
||||
<if test="spec != null">spec = #{spec},</if>
|
||||
<if test="scanNum != null">scan_num = #{scanNum},</if>
|
||||
<if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
|
||||
<if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
|
||||
<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>
|
||||
</trim>
|
||||
where stock_check_detail_id = #{stockCheckDetailId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteCheckStockinDetailByStockCheckDetailId" parameterType="String">
|
||||
delete from check_stockin_detail where stock_check_detail_id = #{stockCheckDetailId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteCheckStockinDetailByStockCheckDetailIds" parameterType="String">
|
||||
delete from check_stockin_detail where stock_check_detail_id in
|
||||
<foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
|
||||
#{stockCheckDetailId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -0,0 +1,143 @@
|
||||
<?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.stockcheckfinish.mapper.CheckStockinFinishMapper">
|
||||
|
||||
<resultMap type="CheckStockinFinish" id="CheckStockinFinishResult">
|
||||
<result property="stockGuid" column="stock_guid" />
|
||||
<result property="stockCheckId" column="stock_check_id" />
|
||||
<result property="checkType" column="check_type" />
|
||||
<result property="createDate" column="create_date" />
|
||||
<result property="createManId" column="create_man_id" />
|
||||
<result property="status" column="status" />
|
||||
<result property="warehouseId" column="warehouse_id" />
|
||||
<result property="spare5" column="spare5" />
|
||||
<result property="spare4" column="spare4" />
|
||||
<result property="spare3" column="spare3" />
|
||||
<result property="finishDate" column="finish_date" />
|
||||
<result property="spare2" column="spare2" />
|
||||
<result property="spare1" column="spare1" />
|
||||
<result property="erpBill" column="erp_bill" />
|
||||
<result property="stockSource" column="stock_source" />
|
||||
<result property="departmentNo" column="department_no" />
|
||||
<result property="customerNo" column="customer_no" />
|
||||
<result property="classNo" column="class_no" />
|
||||
<result property="supplierNo" column="supplier_no" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectCheckStockinFinishVo">
|
||||
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
|
||||
</sql>
|
||||
|
||||
<select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult">
|
||||
<include refid="selectCheckStockinFinishVo"/>
|
||||
<where>
|
||||
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
|
||||
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
|
||||
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
|
||||
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
|
||||
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
|
||||
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
|
||||
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
|
||||
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
|
||||
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
|
||||
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
|
||||
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
|
||||
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
|
||||
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
|
||||
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
|
||||
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
|
||||
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectCheckStockinFinishByStockGuid" parameterType="String" resultMap="CheckStockinFinishResult">
|
||||
<include refid="selectCheckStockinFinishVo"/>
|
||||
where stock_guid = #{stockGuid}
|
||||
</select>
|
||||
|
||||
<insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">
|
||||
insert into check_stockin_finish
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="stockGuid != null">stock_guid,</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
|
||||
<if test="checkType != null and checkType != ''">check_type,</if>
|
||||
<if test="createDate != null and createDate != ''">create_date,</if>
|
||||
<if test="createManId != null">create_man_id,</if>
|
||||
<if test="status != null and status != ''">status,</if>
|
||||
<if test="warehouseId != null">warehouse_id,</if>
|
||||
<if test="spare5 != null">spare5,</if>
|
||||
<if test="spare4 != null">spare4,</if>
|
||||
<if test="spare3 != null">spare3,</if>
|
||||
<if test="finishDate != null">finish_date,</if>
|
||||
<if test="spare2 != null">spare2,</if>
|
||||
<if test="spare1 != null">spare1,</if>
|
||||
<if test="erpBill != null">erp_bill,</if>
|
||||
<if test="stockSource != null">stock_source,</if>
|
||||
<if test="departmentNo != null">department_no,</if>
|
||||
<if test="customerNo != null">customer_no,</if>
|
||||
<if test="classNo != null">class_no,</if>
|
||||
<if test="supplierNo != null">supplier_no,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="stockGuid != null">#{stockGuid},</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
|
||||
<if test="checkType != null and checkType != ''">#{checkType},</if>
|
||||
<if test="createDate != null and createDate != ''">#{createDate},</if>
|
||||
<if test="createManId != null">#{createManId},</if>
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="warehouseId != null">#{warehouseId},</if>
|
||||
<if test="spare5 != null">#{spare5},</if>
|
||||
<if test="spare4 != null">#{spare4},</if>
|
||||
<if test="spare3 != null">#{spare3},</if>
|
||||
<if test="finishDate != null">#{finishDate},</if>
|
||||
<if test="spare2 != null">#{spare2},</if>
|
||||
<if test="spare1 != null">#{spare1},</if>
|
||||
<if test="erpBill != null">#{erpBill},</if>
|
||||
<if test="stockSource != null">#{stockSource},</if>
|
||||
<if test="departmentNo != null">#{departmentNo},</if>
|
||||
<if test="customerNo != null">#{customerNo},</if>
|
||||
<if test="classNo != null">#{classNo},</if>
|
||||
<if test="supplierNo != null">#{supplierNo},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateCheckStockinFinish" parameterType="CheckStockinFinish">
|
||||
update check_stockin_finish
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
|
||||
<if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
|
||||
<if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
|
||||
<if test="createManId != null">create_man_id = #{createManId},</if>
|
||||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
|
||||
<if test="spare5 != null">spare5 = #{spare5},</if>
|
||||
<if test="spare4 != null">spare4 = #{spare4},</if>
|
||||
<if test="spare3 != null">spare3 = #{spare3},</if>
|
||||
<if test="finishDate != null">finish_date = #{finishDate},</if>
|
||||
<if test="spare2 != null">spare2 = #{spare2},</if>
|
||||
<if test="spare1 != null">spare1 = #{spare1},</if>
|
||||
<if test="erpBill != null">erp_bill = #{erpBill},</if>
|
||||
<if test="stockSource != null">stock_source = #{stockSource},</if>
|
||||
<if test="departmentNo != null">department_no = #{departmentNo},</if>
|
||||
<if test="customerNo != null">customer_no = #{customerNo},</if>
|
||||
<if test="classNo != null">class_no = #{classNo},</if>
|
||||
<if test="supplierNo != null">supplier_no = #{supplierNo},</if>
|
||||
</trim>
|
||||
where stock_guid = #{stockGuid}
|
||||
</update>
|
||||
|
||||
<delete id="deleteCheckStockinFinishByStockGuid" parameterType="String">
|
||||
delete from check_stockin_finish where stock_guid = #{stockGuid}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteCheckStockinFinishByStockGuids" parameterType="String">
|
||||
delete from check_stockin_finish where stock_guid in
|
||||
<foreach item="stockGuid" collection="array" open="(" separator="," close=")">
|
||||
#{stockGuid}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -0,0 +1,143 @@
|
||||
<?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.stockcheck.mapper.CheckStockinMapper">
|
||||
|
||||
<resultMap type="CheckStockin" id="CheckStockinResult">
|
||||
<result property="stockGuid" column="stock_guid" />
|
||||
<result property="stockCheckId" column="stock_check_id" />
|
||||
<result property="checkType" column="check_type" />
|
||||
<result property="createDate" column="create_date" />
|
||||
<result property="createManId" column="create_man_id" />
|
||||
<result property="status" column="status" />
|
||||
<result property="warehouseId" column="warehouse_id" />
|
||||
<result property="finishDate" column="finish_date" />
|
||||
<result property="erpBill" column="erp_bill" />
|
||||
<result property="stockSource" column="stock_source" />
|
||||
<result property="departmentNo" column="department_no" />
|
||||
<result property="customerNo" column="customer_no" />
|
||||
<result property="classNo" column="class_no" />
|
||||
<result property="supplierNo" column="supplier_no" />
|
||||
<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" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectCheckStockinVo">
|
||||
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin
|
||||
</sql>
|
||||
|
||||
<select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
|
||||
<include refid="selectCheckStockinVo"/>
|
||||
<where>
|
||||
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
|
||||
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
|
||||
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
|
||||
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
|
||||
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
|
||||
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
|
||||
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
|
||||
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
|
||||
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
|
||||
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
|
||||
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
|
||||
<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>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectCheckStockinByStockGuid" parameterType="String" resultMap="CheckStockinResult">
|
||||
<include refid="selectCheckStockinVo"/>
|
||||
where stock_guid = #{stockGuid}
|
||||
</select>
|
||||
|
||||
<insert id="insertCheckStockin" parameterType="CheckStockin">
|
||||
insert into check_stockin
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="stockGuid != null">stock_guid,</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
|
||||
<if test="checkType != null and checkType != ''">check_type,</if>
|
||||
<if test="createDate != null and createDate != ''">create_date,</if>
|
||||
<if test="createManId != null">create_man_id,</if>
|
||||
<if test="status != null and status != ''">status,</if>
|
||||
<if test="warehouseId != null">warehouse_id,</if>
|
||||
<if test="finishDate != null">finish_date,</if>
|
||||
<if test="erpBill != null">erp_bill,</if>
|
||||
<if test="stockSource != null">stock_source,</if>
|
||||
<if test="departmentNo != null">department_no,</if>
|
||||
<if test="customerNo != null">customer_no,</if>
|
||||
<if test="classNo != null">class_no,</if>
|
||||
<if test="supplierNo != null">supplier_no,</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>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="stockGuid != null">#{stockGuid},</if>
|
||||
<if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
|
||||
<if test="checkType != null and checkType != ''">#{checkType},</if>
|
||||
<if test="createDate != null and createDate != ''">#{createDate},</if>
|
||||
<if test="createManId != null">#{createManId},</if>
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="warehouseId != null">#{warehouseId},</if>
|
||||
<if test="finishDate != null">#{finishDate},</if>
|
||||
<if test="erpBill != null">#{erpBill},</if>
|
||||
<if test="stockSource != null">#{stockSource},</if>
|
||||
<if test="departmentNo != null">#{departmentNo},</if>
|
||||
<if test="customerNo != null">#{customerNo},</if>
|
||||
<if test="classNo != null">#{classNo},</if>
|
||||
<if test="supplierNo != null">#{supplierNo},</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>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateCheckStockin" parameterType="CheckStockin">
|
||||
update check_stockin
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
|
||||
<if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
|
||||
<if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
|
||||
<if test="createManId != null">create_man_id = #{createManId},</if>
|
||||
<if test="status != null and status != ''">status = #{status},</if>
|
||||
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
|
||||
<if test="finishDate != null">finish_date = #{finishDate},</if>
|
||||
<if test="erpBill != null">erp_bill = #{erpBill},</if>
|
||||
<if test="stockSource != null">stock_source = #{stockSource},</if>
|
||||
<if test="departmentNo != null">department_no = #{departmentNo},</if>
|
||||
<if test="customerNo != null">customer_no = #{customerNo},</if>
|
||||
<if test="classNo != null">class_no = #{classNo},</if>
|
||||
<if test="supplierNo != null">supplier_no = #{supplierNo},</if>
|
||||
<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>
|
||||
</trim>
|
||||
where stock_guid = #{stockGuid}
|
||||
</update>
|
||||
|
||||
<delete id="deleteCheckStockinByStockGuid" parameterType="String">
|
||||
delete from check_stockin where stock_guid = #{stockGuid}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteCheckStockinByStockGuids" parameterType="String">
|
||||
delete from check_stockin where stock_guid in
|
||||
<foreach item="stockGuid" collection="array" open="(" separator="," close=")">
|
||||
#{stockGuid}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -38,40 +38,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectInStockinDetailVo">
|
||||
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from in_stockin_detail
|
||||
select stockin_detail_id, stockin_guid, stockin_id, lot_no, isd.product_guid,
|
||||
isd.product_id, quantity, quantity_x, quantity_j, isd.price, isd.cargo_no, isd.remark,
|
||||
assign_num, assign_num_x, assign_num_j, print_date, stock_status,
|
||||
supplier_id, customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
|
||||
isd.spare5, isd.spare6, scan_num, scan_num_x, scan_num_j
|
||||
from in_stockin_detail isd
|
||||
left join bas_product bp on bp.product_id = isd.product_id
|
||||
</sql>
|
||||
|
||||
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
|
||||
<include refid="selectInStockinDetailVo"/>
|
||||
<where>
|
||||
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
|
||||
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
|
||||
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
|
||||
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
|
||||
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
|
||||
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
|
||||
<if test="price != null and price != ''"> and price = #{price}</if>
|
||||
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
|
||||
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
|
||||
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
|
||||
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
|
||||
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
|
||||
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
|
||||
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
|
||||
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
|
||||
<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="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
|
||||
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
|
||||
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
|
||||
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
|
||||
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
|
||||
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
|
||||
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
|
||||
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
|
||||
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
|
||||
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
|
||||
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
|
||||
<if test="price != null and price != ''"> and isd.price = #{price}</if>
|
||||
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
|
||||
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
|
||||
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
|
||||
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
|
||||
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
|
||||
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
|
||||
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
|
||||
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
|
||||
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
|
||||
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
|
||||
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
|
||||
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
|
||||
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
|
||||
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
|
||||
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
|
||||
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
|
||||
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
|
||||
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
|
||||
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user