diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java index 98c96a2..0c4b3fd 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java @@ -4,8 +4,10 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; +import com.ktg.mes.wm.service.IWmProductRecptLineService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -36,6 +38,9 @@ public class WmProductRecptController extends BaseController @Autowired private IWmProductRecptService wmProductRecptService; + @Autowired + private IWmProductRecptLineService wmProductRecptLineService; + /** * 查询产品入库录列表 */ @@ -104,9 +109,14 @@ public class WmProductRecptController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:remove')") @Log(title = "产品入库录", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{recptIds}") public AjaxResult remove(@PathVariable Long[] recptIds) { + for (Long recptId: recptIds + ) { + wmProductRecptLineService.deleteByRecptId(recptId) + } return toAjax(wmProductRecptService.deleteWmProductRecptByRecptIds(recptIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptLineController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptLineController.java new file mode 100644 index 0000000..5141b08 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptLineController.java @@ -0,0 +1,104 @@ +package com.ktg.mes.wm.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.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.wm.domain.WmProductRecptLine; +import com.ktg.mes.wm.service.IWmProductRecptLineService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 产品入库记录行Controller + * + * @author yinjinlu + * @date 2022-09-22 + */ +@RestController +@RequestMapping("/mes/wm/productrecptline") +public class WmProductRecptLineController extends BaseController +{ + @Autowired + private IWmProductRecptLineService wmProductRecptLineService; + + /** + * 查询产品入库记录行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecptline:list')") + @GetMapping("/list") + public TableDataInfo list(WmProductRecptLine wmProductRecptLine) + { + startPage(); + List list = wmProductRecptLineService.selectWmProductRecptLineList(wmProductRecptLine); + return getDataTable(list); + } + + /** + * 导出产品入库记录行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecptline:export')") + @Log(title = "产品入库记录行", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmProductRecptLine wmProductRecptLine) + { + List list = wmProductRecptLineService.selectWmProductRecptLineList(wmProductRecptLine); + ExcelUtil util = new ExcelUtil(WmProductRecptLine.class); + util.exportExcel(response, list, "产品入库记录行数据"); + } + + /** + * 获取产品入库记录行详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecptline:query')") + @GetMapping(value = "/{lineId}") + public AjaxResult getInfo(@PathVariable("lineId") Long lineId) + { + return AjaxResult.success(wmProductRecptLineService.selectWmProductRecptLineByLineId(lineId)); + } + + /** + * 新增产品入库记录行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecptline:add')") + @Log(title = "产品入库记录行", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmProductRecptLine wmProductRecptLine) + { + return toAjax(wmProductRecptLineService.insertWmProductRecptLine(wmProductRecptLine)); + } + + /** + * 修改产品入库记录行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecptline:edit')") + @Log(title = "产品入库记录行", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmProductRecptLine wmProductRecptLine) + { + return toAjax(wmProductRecptLineService.updateWmProductRecptLine(wmProductRecptLine)); + } + + /** + * 删除产品入库记录行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecptline:remove')") + @Log(title = "产品入库记录行", businessType = BusinessType.DELETE) + @DeleteMapping("/{lineIds}") + public AjaxResult remove(@PathVariable Long[] lineIds) + { + return toAjax(wmProductRecptLineService.deleteWmProductRecptLineByLineIds(lineIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java new file mode 100644 index 0000000..7fbd641 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java @@ -0,0 +1,347 @@ +package com.ktg.mes.wm.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 产品入库记录行对象 wm_product_recpt_line + * + * @author yinjinlu + * @date 2022-09-22 + */ +public class WmProductRecptLine extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 行ID */ + private Long lineId; + + /** 入库记录ID */ + @Excel(name = "入库记录ID") + private Long recptId; + + /** 库存记录ID */ + @Excel(name = "库存记录ID") + private Long materialStockId; + + /** 产品物料ID */ + @Excel(name = "产品物料ID") + private Long itemId; + + /** 产品物料编码 */ + @Excel(name = "产品物料编码") + private String itemCode; + + /** 产品物料名称 */ + @Excel(name = "产品物料名称") + private String itemName; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String specification; + + /** 单位 */ + @Excel(name = "单位") + private String unitOfMeasure; + + /** 入库数量 */ + @Excel(name = "入库数量") + private BigDecimal quantityRecived; + + /** 批次号 */ + @Excel(name = "批次号") + private String batchCode; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private Long warehouseId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String warehouseCode; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 库区ID */ + @Excel(name = "库区ID") + private Long locationId; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String locationCode; + + /** 库区名称 */ + @Excel(name = "库区名称") + private String locationName; + + /** 库位ID */ + @Excel(name = "库位ID") + private Long areaId; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String areaCode; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String areaName; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setLineId(Long lineId) + { + this.lineId = lineId; + } + + public Long getLineId() + { + return lineId; + } + public void setRecptId(Long recptId) + { + this.recptId = recptId; + } + + public Long getRecptId() + { + return recptId; + } + public void setMaterialStockId(Long materialStockId) + { + this.materialStockId = materialStockId; + } + + public Long getMaterialStockId() + { + return materialStockId; + } + public void setItemId(Long itemId) + { + this.itemId = itemId; + } + + public Long getItemId() + { + return itemId; + } + public void setItemCode(String itemCode) + { + this.itemCode = itemCode; + } + + public String getItemCode() + { + return itemCode; + } + public void setItemName(String itemName) + { + this.itemName = itemName; + } + + public String getItemName() + { + return itemName; + } + public void setSpecification(String specification) + { + this.specification = specification; + } + + public String getSpecification() + { + return specification; + } + public void setUnitOfMeasure(String unitOfMeasure) + { + this.unitOfMeasure = unitOfMeasure; + } + + public String getUnitOfMeasure() + { + return unitOfMeasure; + } + public void setQuantityRecived(BigDecimal quantityRecived) + { + this.quantityRecived = quantityRecived; + } + + public BigDecimal getQuantityRecived() + { + return quantityRecived; + } + public void setBatchCode(String batchCode) + { + this.batchCode = batchCode; + } + + public String getBatchCode() + { + return batchCode; + } + public void setWarehouseId(Long warehouseId) + { + this.warehouseId = warehouseId; + } + + public Long getWarehouseId() + { + return warehouseId; + } + public void setWarehouseCode(String warehouseCode) + { + this.warehouseCode = warehouseCode; + } + + public String getWarehouseCode() + { + return warehouseCode; + } + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setLocationId(Long locationId) + { + this.locationId = locationId; + } + + public Long getLocationId() + { + return locationId; + } + public void setLocationCode(String locationCode) + { + this.locationCode = locationCode; + } + + public String getLocationCode() + { + return locationCode; + } + public void setLocationName(String locationName) + { + this.locationName = locationName; + } + + public String getLocationName() + { + return locationName; + } + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + public void setAreaCode(String areaCode) + { + this.areaCode = areaCode; + } + + public String getAreaCode() + { + return areaCode; + } + public void setAreaName(String areaName) + { + this.areaName = areaName; + } + + public String getAreaName() + { + return areaName; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("lineId", getLineId()) + .append("recptId", getRecptId()) + .append("materialStockId", getMaterialStockId()) + .append("itemId", getItemId()) + .append("itemCode", getItemCode()) + .append("itemName", getItemName()) + .append("specification", getSpecification()) + .append("unitOfMeasure", getUnitOfMeasure()) + .append("quantityRecived", getQuantityRecived()) + .append("batchCode", getBatchCode()) + .append("warehouseId", getWarehouseId()) + .append("warehouseCode", getWarehouseCode()) + .append("warehouseName", getWarehouseName()) + .append("locationId", getLocationId()) + .append("locationCode", getLocationCode()) + .append("locationName", getLocationName()) + .append("areaId", getAreaId()) + .append("areaCode", getAreaCode()) + .append("areaName", getAreaName()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductRecptLineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductRecptLineMapper.java new file mode 100644 index 0000000..8286cf1 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductRecptLineMapper.java @@ -0,0 +1,68 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmProductRecptLine; + +/** + * 产品入库记录行Mapper接口 + * + * @author yinjinlu + * @date 2022-09-22 + */ +public interface WmProductRecptLineMapper +{ + /** + * 查询产品入库记录行 + * + * @param lineId 产品入库记录行主键 + * @return 产品入库记录行 + */ + public WmProductRecptLine selectWmProductRecptLineByLineId(Long lineId); + + /** + * 查询产品入库记录行列表 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 产品入库记录行集合 + */ + public List selectWmProductRecptLineList(WmProductRecptLine wmProductRecptLine); + + /** + * 新增产品入库记录行 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 结果 + */ + public int insertWmProductRecptLine(WmProductRecptLine wmProductRecptLine); + + /** + * 修改产品入库记录行 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 结果 + */ + public int updateWmProductRecptLine(WmProductRecptLine wmProductRecptLine); + + /** + * 删除产品入库记录行 + * + * @param lineId 产品入库记录行主键 + * @return 结果 + */ + public int deleteWmProductRecptLineByLineId(Long lineId); + + /** + * 批量删除产品入库记录行 + * + * @param lineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmProductRecptLineByLineIds(Long[] lineIds); + + /** + * 根据入库单ID删除所有行 + * @param recptId + * @return + */ + public int deleteByRecptId(Long recptId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductRecptLineService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductRecptLineService.java new file mode 100644 index 0000000..0d226d2 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductRecptLineService.java @@ -0,0 +1,68 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmProductRecptLine; + +/** + * 产品入库记录行Service接口 + * + * @author yinjinlu + * @date 2022-09-22 + */ +public interface IWmProductRecptLineService +{ + /** + * 查询产品入库记录行 + * + * @param lineId 产品入库记录行主键 + * @return 产品入库记录行 + */ + public WmProductRecptLine selectWmProductRecptLineByLineId(Long lineId); + + /** + * 查询产品入库记录行列表 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 产品入库记录行集合 + */ + public List selectWmProductRecptLineList(WmProductRecptLine wmProductRecptLine); + + /** + * 新增产品入库记录行 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 结果 + */ + public int insertWmProductRecptLine(WmProductRecptLine wmProductRecptLine); + + /** + * 修改产品入库记录行 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 结果 + */ + public int updateWmProductRecptLine(WmProductRecptLine wmProductRecptLine); + + /** + * 批量删除产品入库记录行 + * + * @param lineIds 需要删除的产品入库记录行主键集合 + * @return 结果 + */ + public int deleteWmProductRecptLineByLineIds(Long[] lineIds); + + /** + * 删除产品入库记录行信息 + * + * @param lineId 产品入库记录行主键 + * @return 结果 + */ + public int deleteWmProductRecptLineByLineId(Long lineId); + + /** + * 根据入库单ID删除所有行 + * @param recptId + * @return + */ + public int deleteByRecptId(Long recptId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductRecptLineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductRecptLineServiceImpl.java new file mode 100644 index 0000000..9959ac0 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductRecptLineServiceImpl.java @@ -0,0 +1,101 @@ +package com.ktg.mes.wm.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.wm.mapper.WmProductRecptLineMapper; +import com.ktg.mes.wm.domain.WmProductRecptLine; +import com.ktg.mes.wm.service.IWmProductRecptLineService; + +/** + * 产品入库记录行Service业务层处理 + * + * @author yinjinlu + * @date 2022-09-22 + */ +@Service +public class WmProductRecptLineServiceImpl implements IWmProductRecptLineService +{ + @Autowired + private WmProductRecptLineMapper wmProductRecptLineMapper; + + /** + * 查询产品入库记录行 + * + * @param lineId 产品入库记录行主键 + * @return 产品入库记录行 + */ + @Override + public WmProductRecptLine selectWmProductRecptLineByLineId(Long lineId) + { + return wmProductRecptLineMapper.selectWmProductRecptLineByLineId(lineId); + } + + /** + * 查询产品入库记录行列表 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 产品入库记录行 + */ + @Override + public List selectWmProductRecptLineList(WmProductRecptLine wmProductRecptLine) + { + return wmProductRecptLineMapper.selectWmProductRecptLineList(wmProductRecptLine); + } + + /** + * 新增产品入库记录行 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 结果 + */ + @Override + public int insertWmProductRecptLine(WmProductRecptLine wmProductRecptLine) + { + wmProductRecptLine.setCreateTime(DateUtils.getNowDate()); + return wmProductRecptLineMapper.insertWmProductRecptLine(wmProductRecptLine); + } + + /** + * 修改产品入库记录行 + * + * @param wmProductRecptLine 产品入库记录行 + * @return 结果 + */ + @Override + public int updateWmProductRecptLine(WmProductRecptLine wmProductRecptLine) + { + wmProductRecptLine.setUpdateTime(DateUtils.getNowDate()); + return wmProductRecptLineMapper.updateWmProductRecptLine(wmProductRecptLine); + } + + /** + * 批量删除产品入库记录行 + * + * @param lineIds 需要删除的产品入库记录行主键 + * @return 结果 + */ + @Override + public int deleteWmProductRecptLineByLineIds(Long[] lineIds) + { + return wmProductRecptLineMapper.deleteWmProductRecptLineByLineIds(lineIds); + } + + /** + * 删除产品入库记录行信息 + * + * @param lineId 产品入库记录行主键 + * @return 结果 + */ + @Override + public int deleteWmProductRecptLineByLineId(Long lineId) + { + return wmProductRecptLineMapper.deleteWmProductRecptLineByLineId(lineId); + } + + @Override + public int deleteByRecptId(Long recptId) { + return wmProductRecptLineMapper.deleteByRecptId(recptId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml new file mode 100644 index 0000000..766f4f1 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line + + + + + + + + insert into wm_product_recpt_line + + recpt_id, + material_stock_id, + item_id, + item_code, + item_name, + specification, + unit_of_measure, + quantity_recived, + batch_code, + warehouse_id, + warehouse_code, + warehouse_name, + location_id, + location_code, + location_name, + area_id, + area_code, + area_name, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{recptId}, + #{materialStockId}, + #{itemId}, + #{itemCode}, + #{itemName}, + #{specification}, + #{unitOfMeasure}, + #{quantityRecived}, + #{batchCode}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_product_recpt_line + + recpt_id = #{recptId}, + material_stock_id = #{materialStockId}, + item_id = #{itemId}, + item_code = #{itemCode}, + item_name = #{itemName}, + specification = #{specification}, + unit_of_measure = #{unitOfMeasure}, + quantity_recived = #{quantityRecived}, + batch_code = #{batchCode}, + warehouse_id = #{warehouseId}, + warehouse_code = #{warehouseCode}, + warehouse_name = #{warehouseName}, + location_id = #{locationId}, + location_code = #{locationCode}, + location_name = #{locationName}, + area_id = #{areaId}, + area_code = #{areaCode}, + area_name = #{areaName}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where line_id = #{lineId} + + + + delete from wm_product_recpt_line where line_id = #{lineId} + + + + delete from wm_product_recpt_line where line_id in + + #{lineId} + + + + + delete from wm_product_recpt_line where recpt_id = #{recptId} + + \ No newline at end of file