diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java new file mode 100644 index 0000000..7aa4dca --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueController.java @@ -0,0 +1,140 @@ +package com.ktg.mes.wm.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.collection.CollUtil; +import com.ktg.common.constant.UserConstants; +import com.ktg.mes.wm.domain.WmIssueHeader; +import com.ktg.mes.wm.domain.WmIssueLine; +import com.ktg.mes.wm.domain.WmOutsourceIssueLine; +import com.ktg.mes.wm.domain.tx.IssueTxBean; +import com.ktg.mes.wm.service.IWmOutsourceIssueLineService; +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; +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.WmOutsourceIssue; +import com.ktg.mes.wm.service.IWmOutsourceIssueService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 外协领料单头Controller + * + * @author yinjinlu + * @date 2023-10-30 + */ +@RestController +@RequestMapping("/mes/wm/outsourceissue") +public class WmOutsourceIssueController extends BaseController +{ + @Autowired + private IWmOutsourceIssueService wmOutsourceIssueService; + + @Autowired + private IWmOutsourceIssueLineService wmOutsourceIssueLineService; + + /** + * 查询外协领料单头列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:list')") + @GetMapping("/list") + public TableDataInfo list(WmOutsourceIssue wmOutsourceIssue) + { + startPage(); + List list = wmOutsourceIssueService.selectWmOutsourceIssueList(wmOutsourceIssue); + return getDataTable(list); + } + + /** + * 导出外协领料单头列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:export')") + @Log(title = "外协领料单头", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmOutsourceIssue wmOutsourceIssue) + { + List list = wmOutsourceIssueService.selectWmOutsourceIssueList(wmOutsourceIssue); + ExcelUtil util = new ExcelUtil(WmOutsourceIssue.class); + util.exportExcel(response, list, "外协领料单头数据"); + } + + /** + * 获取外协领料单头详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:query')") + @GetMapping(value = "/{issueId}") + public AjaxResult getInfo(@PathVariable("issueId") Long issueId) + { + return AjaxResult.success(wmOutsourceIssueService.selectWmOutsourceIssueByIssueId(issueId)); + } + + /** + * 新增外协领料单头 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:add')") + @Log(title = "外协领料单头", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmOutsourceIssue wmOutsourceIssue) + { + return toAjax(wmOutsourceIssueService.insertWmOutsourceIssue(wmOutsourceIssue)); + } + + /** + * 修改外协领料单头 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:edit')") + @Log(title = "外协领料单头", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmOutsourceIssue wmOutsourceIssue) + { + return toAjax(wmOutsourceIssueService.updateWmOutsourceIssue(wmOutsourceIssue)); + } + + /** + * 删除外协领料单头 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:remove')") + @Log(title = "外协领料单头", businessType = BusinessType.DELETE) + @DeleteMapping("/{issueIds}") + public AjaxResult remove(@PathVariable Long[] issueIds) + { + return toAjax(wmOutsourceIssueService.deleteWmOutsourceIssueByIssueIds(issueIds)); + } + + /** + * 执行出库 + * @return + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:edit')") + @Log(title = "外协领料单头", businessType = BusinessType.UPDATE) + @Transactional + @PutMapping("/{issueId}") + public AjaxResult execute(@PathVariable Long issueId){ + WmOutsourceIssue header = wmOutsourceIssueService.selectWmOutsourceIssueByIssueId(issueId); + WmOutsourceIssueLine param = new WmOutsourceIssueLine(); + param.setIssueId(issueId); + List lines = wmOutsourceIssueLineService.selectWmOutsourceIssueLineList(param); + if(CollUtil.isEmpty(lines)){ + return AjaxResult.error("请指定领出的物资"); + } + //TODO: 库存事务核心处理 + + //更新单据状态 + header.setStatus(UserConstants.ORDER_STATUS_FINISHED); + wmOutsourceIssueService.updateWmOutsourceIssue(header); + return AjaxResult.success(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueLineController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueLineController.java new file mode 100644 index 0000000..885f93b --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceIssueLineController.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.WmOutsourceIssueLine; +import com.ktg.mes.wm.service.IWmOutsourceIssueLineService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 外协领料单行Controller + * + * @author yinjinlu + * @date 2023-10-30 + */ +@RestController +@RequestMapping("/mes/wm/outsourceissueline") +public class WmOutsourceIssueLineController extends BaseController +{ + @Autowired + private IWmOutsourceIssueLineService wmOutsourceIssueLineService; + + /** + * 查询外协领料单行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:list')") + @GetMapping("/list") + public TableDataInfo list(WmOutsourceIssueLine wmOutsourceIssueLine) + { + startPage(); + List list = wmOutsourceIssueLineService.selectWmOutsourceIssueLineList(wmOutsourceIssueLine); + return getDataTable(list); + } + + /** + * 导出外协领料单行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:export')") + @Log(title = "外协领料单行", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmOutsourceIssueLine wmOutsourceIssueLine) + { + List list = wmOutsourceIssueLineService.selectWmOutsourceIssueLineList(wmOutsourceIssueLine); + ExcelUtil util = new ExcelUtil(WmOutsourceIssueLine.class); + util.exportExcel(response, list, "外协领料单行数据"); + } + + /** + * 获取外协领料单行详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:query')") + @GetMapping(value = "/{lineId}") + public AjaxResult getInfo(@PathVariable("lineId") Long lineId) + { + return AjaxResult.success(wmOutsourceIssueLineService.selectWmOutsourceIssueLineByLineId(lineId)); + } + + /** + * 新增外协领料单行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:add')") + @Log(title = "外协领料单行", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmOutsourceIssueLine wmOutsourceIssueLine) + { + return toAjax(wmOutsourceIssueLineService.insertWmOutsourceIssueLine(wmOutsourceIssueLine)); + } + + /** + * 修改外协领料单行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:edit')") + @Log(title = "外协领料单行", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmOutsourceIssueLine wmOutsourceIssueLine) + { + return toAjax(wmOutsourceIssueLineService.updateWmOutsourceIssueLine(wmOutsourceIssueLine)); + } + + /** + * 删除外协领料单行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourceissue:remove')") + @Log(title = "外协领料单行", businessType = BusinessType.DELETE) + @DeleteMapping("/{lineIds}") + public AjaxResult remove(@PathVariable Long[] lineIds) + { + return toAjax(wmOutsourceIssueLineService.deleteWmOutsourceIssueLineByLineIds(lineIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.java new file mode 100644 index 0000000..7568fc5 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptController.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.WmOutsourceRecpt; +import com.ktg.mes.wm.service.IWmOutsourceRecptService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 外协入库单Controller + * + * @author yinjinlu + * @date 2023-10-30 + */ +@RestController +@RequestMapping("/mes/wm/outsourcerecpt") +public class WmOutsourceRecptController extends BaseController +{ + @Autowired + private IWmOutsourceRecptService wmOutsourceRecptService; + + /** + * 查询外协入库单列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourcerecpt:list')") + @GetMapping("/list") + public TableDataInfo list(WmOutsourceRecpt wmOutsourceRecpt) + { + startPage(); + List list = wmOutsourceRecptService.selectWmOutsourceRecptList(wmOutsourceRecpt); + return getDataTable(list); + } + + /** + * 导出外协入库单列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourcerecpt:export')") + @Log(title = "外协入库单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmOutsourceRecpt wmOutsourceRecpt) + { + List list = wmOutsourceRecptService.selectWmOutsourceRecptList(wmOutsourceRecpt); + ExcelUtil util = new ExcelUtil(WmOutsourceRecpt.class); + util.exportExcel(response, list, "外协入库单数据"); + } + + /** + * 获取外协入库单详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourcerecpt:query')") + @GetMapping(value = "/{recptId}") + public AjaxResult getInfo(@PathVariable("recptId") Long recptId) + { + return AjaxResult.success(wmOutsourceRecptService.selectWmOutsourceRecptByRecptId(recptId)); + } + + /** + * 新增外协入库单 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourcerecpt:add')") + @Log(title = "外协入库单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmOutsourceRecpt wmOutsourceRecpt) + { + return toAjax(wmOutsourceRecptService.insertWmOutsourceRecpt(wmOutsourceRecpt)); + } + + /** + * 修改外协入库单 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourcerecpt:edit')") + @Log(title = "外协入库单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmOutsourceRecpt wmOutsourceRecpt) + { + return toAjax(wmOutsourceRecptService.updateWmOutsourceRecpt(wmOutsourceRecpt)); + } + + /** + * 删除外协入库单 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:outsourcerecpt:remove')") + @Log(title = "外协入库单", businessType = BusinessType.DELETE) + @DeleteMapping("/{recptIds}") + public AjaxResult remove(@PathVariable Long[] recptIds) + { + return toAjax(wmOutsourceRecptService.deleteWmOutsourceRecptByRecptIds(recptIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptLineController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptLineController.java new file mode 100644 index 0000000..de8d3a2 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmOutsourceRecptLineController.java @@ -0,0 +1,155 @@ +package com.ktg.mes.wm.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.utils.StringUtils; +import com.ktg.mes.wm.domain.WmStorageArea; +import com.ktg.mes.wm.domain.WmStorageLocation; +import com.ktg.mes.wm.domain.WmWarehouse; +import com.ktg.mes.wm.service.IWmStorageAreaService; +import com.ktg.mes.wm.service.IWmStorageLocationService; +import com.ktg.mes.wm.service.IWmWarehouseService; +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.WmOutsourceRecptLine; +import com.ktg.mes.wm.service.IWmOutsourceRecptLineService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 外协入库单行Controller + * + * @author yinjinlu + * @date 2023-10-30 + */ +@RestController +@RequestMapping("/mes/wm/oursourcerecptline") +public class WmOutsourceRecptLineController extends BaseController +{ + @Autowired + private IWmOutsourceRecptLineService wmOutsourceRecptLineService; + + + @Autowired + private IWmWarehouseService wmWarehouseService; + + @Autowired + private IWmStorageLocationService wmStorageLocationService; + + @Autowired + private IWmStorageAreaService wmStorageAreaService; + + /** + * 查询外协入库单行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:oursourcerecpt:list')") + @GetMapping("/list") + public TableDataInfo list(WmOutsourceRecptLine wmOutsourceRecptLine) + { + startPage(); + List list = wmOutsourceRecptLineService.selectWmOutsourceRecptLineList(wmOutsourceRecptLine); + return getDataTable(list); + } + + /** + * 导出外协入库单行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:oursourcerecpt:export')") + @Log(title = "外协入库单行", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmOutsourceRecptLine wmOutsourceRecptLine) + { + List list = wmOutsourceRecptLineService.selectWmOutsourceRecptLineList(wmOutsourceRecptLine); + ExcelUtil util = new ExcelUtil(WmOutsourceRecptLine.class); + util.exportExcel(response, list, "外协入库单行数据"); + } + + /** + * 获取外协入库单行详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:oursourcerecpt:query')") + @GetMapping(value = "/{lineId}") + public AjaxResult getInfo(@PathVariable("lineId") Long lineId) + { + return AjaxResult.success(wmOutsourceRecptLineService.selectWmOutsourceRecptLineByLineId(lineId)); + } + + /** + * 新增外协入库单行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:oursourcerecpt:add')") + @Log(title = "外协入库单行", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmOutsourceRecptLine wmOutsourceRecptLine) + { + if(StringUtils.isNotNull(wmOutsourceRecptLine.getWarehouseId())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmOutsourceRecptLine.getWarehouseId()); + wmOutsourceRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); + wmOutsourceRecptLine.setWarehouseName(warehouse.getWarehouseName()); + } + if(StringUtils.isNotNull(wmOutsourceRecptLine.getLocationId())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmOutsourceRecptLine.getLocationId()); + wmOutsourceRecptLine.setLocationCode(location.getLocationCode()); + wmOutsourceRecptLine.setLocationName(location.getLocationName()); + } + if(StringUtils.isNotNull(wmOutsourceRecptLine.getAreaId())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmOutsourceRecptLine.getAreaId()); + wmOutsourceRecptLine.setAreaCode(area.getAreaCode()); + wmOutsourceRecptLine.setAreaName(area.getAreaName()); + } + wmOutsourceRecptLine.setCreateBy(getUsername()); + + return toAjax(wmOutsourceRecptLineService.insertWmOutsourceRecptLine(wmOutsourceRecptLine)); + } + + /** + * 修改外协入库单行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:oursourcerecpt:edit')") + @Log(title = "外协入库单行", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmOutsourceRecptLine wmOutsourceRecptLine) + { + if(StringUtils.isNotNull(wmOutsourceRecptLine.getWarehouseId())){ + WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmOutsourceRecptLine.getWarehouseId()); + wmOutsourceRecptLine.setWarehouseCode(warehouse.getWarehouseCode()); + wmOutsourceRecptLine.setWarehouseName(warehouse.getWarehouseName()); + } + if(StringUtils.isNotNull(wmOutsourceRecptLine.getLocationId())){ + WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmOutsourceRecptLine.getLocationId()); + wmOutsourceRecptLine.setLocationCode(location.getLocationCode()); + wmOutsourceRecptLine.setLocationName(location.getLocationName()); + } + if(StringUtils.isNotNull(wmOutsourceRecptLine.getAreaId())){ + WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmOutsourceRecptLine.getAreaId()); + wmOutsourceRecptLine.setAreaCode(area.getAreaCode()); + wmOutsourceRecptLine.setAreaName(area.getAreaName()); + } + + return toAjax(wmOutsourceRecptLineService.updateWmOutsourceRecptLine(wmOutsourceRecptLine)); + } + + /** + * 删除外协入库单行 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:oursourcerecpt:remove')") + @Log(title = "外协入库单行", businessType = BusinessType.DELETE) + @DeleteMapping("/{lineIds}") + public AjaxResult remove(@PathVariable Long[] lineIds) + { + return toAjax(wmOutsourceRecptLineService.deleteWmOutsourceRecptLineByLineIds(lineIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssue.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssue.java new file mode 100644 index 0000000..97bca09 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssue.java @@ -0,0 +1,363 @@ +package com.ktg.mes.wm.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_outsource_issue + * + * @author yinjinlu + * @date 2023-10-30 + */ +public class WmOutsourceIssue extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 领料单ID */ + private Long issueId; + + /** 领料单编号 */ + @Excel(name = "领料单编号") + private String issueCode; + + /** 领料单名称 */ + @Excel(name = "领料单名称") + private String issueName; + + /** 生产工单ID */ + @Excel(name = "生产工单ID") + private Long workorderId; + + /** 生产工单编码 */ + @Excel(name = "生产工单编码") + private String workorderCode; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private Long vendorId; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String vendorCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String vendorName; + + /** 供应商简称 */ + @Excel(name = "供应商简称") + private String vendorNick; + + /** 仓库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; + + /** 领料日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "领料日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date issueDate; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setIssueId(Long issueId) + { + this.issueId = issueId; + } + + public Long getIssueId() + { + return issueId; + } + public void setIssueCode(String issueCode) + { + this.issueCode = issueCode; + } + + public String getIssueCode() + { + return issueCode; + } + public void setIssueName(String issueName) + { + this.issueName = issueName; + } + + public String getIssueName() + { + return issueName; + } + public void setWorkorderId(Long workorderId) + { + this.workorderId = workorderId; + } + + public Long getWorkorderId() + { + return workorderId; + } + public void setWorkorderCode(String workorderCode) + { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() + { + return workorderCode; + } + public void setVendorId(Long vendorId) + { + this.vendorId = vendorId; + } + + public Long getVendorId() + { + return vendorId; + } + public void setVendorCode(String vendorCode) + { + this.vendorCode = vendorCode; + } + + public String getVendorCode() + { + return vendorCode; + } + public void setVendorName(String vendorName) + { + this.vendorName = vendorName; + } + + public String getVendorName() + { + return vendorName; + } + public void setVendorNick(String vendorNick) + { + this.vendorNick = vendorNick; + } + + public String getVendorNick() + { + return vendorNick; + } + 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 setIssueDate(Date issueDate) + { + this.issueDate = issueDate; + } + + public Date getIssueDate() + { + return issueDate; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + 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("issueId", getIssueId()) + .append("issueCode", getIssueCode()) + .append("issueName", getIssueName()) + .append("workorderId", getWorkorderId()) + .append("workorderCode", getWorkorderCode()) + .append("vendorId", getVendorId()) + .append("vendorCode", getVendorCode()) + .append("vendorName", getVendorName()) + .append("vendorNick", getVendorNick()) + .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("issueDate", getIssueDate()) + .append("status", getStatus()) + .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/domain/WmOutsourceIssueLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java new file mode 100644 index 0000000..e1ca171 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.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_outsource_issue_line + * + * @author yinjinlu + * @date 2023-10-30 + */ +public class WmOutsourceIssueLine extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 行ID */ + private Long lineId; + + /** 领料单ID */ + @Excel(name = "领料单ID") + private Long issueId; + + /** 库存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 quantityIssued; + + /** 领料批次号 */ + @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 setIssueId(Long issueId) + { + this.issueId = issueId; + } + + public Long getIssueId() + { + return issueId; + } + 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 setQuantityIssued(BigDecimal quantityIssued) + { + this.quantityIssued = quantityIssued; + } + + public BigDecimal getQuantityIssued() + { + return quantityIssued; + } + 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("issueId", getIssueId()) + .append("materialStockId", getMaterialStockId()) + .append("itemId", getItemId()) + .append("itemCode", getItemCode()) + .append("itemName", getItemName()) + .append("specification", getSpecification()) + .append("unitOfMeasure", getUnitOfMeasure()) + .append("quantityIssued", getQuantityIssued()) + .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/domain/WmOutsourceRecpt.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecpt.java new file mode 100644 index 0000000..2cd7119 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecpt.java @@ -0,0 +1,391 @@ +package com.ktg.mes.wm.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_outsource_recpt + * + * @author yinjinlu + * @date 2023-10-30 + */ +public class WmOutsourceRecpt extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 入库单ID */ + private Long recptId; + + /** 入库单编号 */ + @Excel(name = "入库单编号") + private String recptCode; + + /** 入库单名称 */ + @Excel(name = "入库单名称") + private String recptName; + + /** 来料检验单ID */ + @Excel(name = "来料检验单ID") + private Long iqcId; + + /** 来料检验单编号 */ + @Excel(name = "来料检验单编号") + private String iqcCode; + + /** 外协工单ID */ + @Excel(name = "外协工单ID") + private Long workorderId; + + /** 外协工单编号 */ + @Excel(name = "外协工单编号") + private String workorderCode; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private Long vendorId; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String vendorCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String vendorName; + + /** 供应商简称 */ + @Excel(name = "供应商简称") + private String vendorNick; + + /** 仓库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; + + /** 入库日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date recptDate; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setRecptId(Long recptId) + { + this.recptId = recptId; + } + + public Long getRecptId() + { + return recptId; + } + public void setRecptCode(String recptCode) + { + this.recptCode = recptCode; + } + + public String getRecptCode() + { + return recptCode; + } + public void setRecptName(String recptName) + { + this.recptName = recptName; + } + + public String getRecptName() + { + return recptName; + } + public void setIqcId(Long iqcId) + { + this.iqcId = iqcId; + } + + public Long getIqcId() + { + return iqcId; + } + public void setIqcCode(String iqcCode) + { + this.iqcCode = iqcCode; + } + + public String getIqcCode() + { + return iqcCode; + } + public void setWorkorderId(Long workorderId) + { + this.workorderId = workorderId; + } + + public Long getWorkorderId() + { + return workorderId; + } + public void setWorkorderCode(String workorderCode) + { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() + { + return workorderCode; + } + public void setVendorId(Long vendorId) + { + this.vendorId = vendorId; + } + + public Long getVendorId() + { + return vendorId; + } + public void setVendorCode(String vendorCode) + { + this.vendorCode = vendorCode; + } + + public String getVendorCode() + { + return vendorCode; + } + public void setVendorName(String vendorName) + { + this.vendorName = vendorName; + } + + public String getVendorName() + { + return vendorName; + } + public void setVendorNick(String vendorNick) + { + this.vendorNick = vendorNick; + } + + public String getVendorNick() + { + return vendorNick; + } + 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 setRecptDate(Date recptDate) + { + this.recptDate = recptDate; + } + + public Date getRecptDate() + { + return recptDate; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + 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("recptId", getRecptId()) + .append("recptCode", getRecptCode()) + .append("recptName", getRecptName()) + .append("iqcId", getIqcId()) + .append("iqcCode", getIqcCode()) + .append("workorderId", getWorkorderId()) + .append("workorderCode", getWorkorderCode()) + .append("vendorId", getVendorId()) + .append("vendorCode", getVendorCode()) + .append("vendorName", getVendorName()) + .append("vendorNick", getVendorNick()) + .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("recptDate", getRecptDate()) + .append("status", getStatus()) + .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/domain/WmOutsourceRecptLine.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java new file mode 100644 index 0000000..b411d72 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java @@ -0,0 +1,392 @@ +package com.ktg.mes.wm.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_outsource_recpt_line + * + * @author yinjinlu + * @date 2023-10-30 + */ +public class WmOutsourceRecptLine 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 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; + + /** 有效期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd") + private Date expireDate; + + /** 是否来料检验 */ + @Excel(name = "是否来料检验") + private String iqcCheck; + + /** 来料检验单ID */ + @Excel(name = "来料检验单ID") + private Long iqcId; + + /** 来料检验单编号 */ + @Excel(name = "来料检验单编号") + private String iqcCode; + + /** 预留字段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 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 setExpireDate(Date expireDate) + { + this.expireDate = expireDate; + } + + public Date getExpireDate() + { + return expireDate; + } + public void setIqcCheck(String iqcCheck) + { + this.iqcCheck = iqcCheck; + } + + public String getIqcCheck() + { + return iqcCheck; + } + public void setIqcId(Long iqcId) + { + this.iqcId = iqcId; + } + + public Long getIqcId() + { + return iqcId; + } + public void setIqcCode(String iqcCode) + { + this.iqcCode = iqcCode; + } + + public String getIqcCode() + { + return iqcCode; + } + 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("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("expireDate", getExpireDate()) + .append("iqcCheck", getIqcCheck()) + .append("iqcId", getIqcId()) + .append("iqcCode", getIqcCode()) + .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/WmOutsourceIssueLineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueLineMapper.java new file mode 100644 index 0000000..e5525ec --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueLineMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceIssueLine; + +/** + * 外协领料单行Mapper接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface WmOutsourceIssueLineMapper +{ + /** + * 查询外协领料单行 + * + * @param lineId 外协领料单行主键 + * @return 外协领料单行 + */ + public WmOutsourceIssueLine selectWmOutsourceIssueLineByLineId(Long lineId); + + /** + * 查询外协领料单行列表 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 外协领料单行集合 + */ + public List selectWmOutsourceIssueLineList(WmOutsourceIssueLine wmOutsourceIssueLine); + + /** + * 新增外协领料单行 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 结果 + */ + public int insertWmOutsourceIssueLine(WmOutsourceIssueLine wmOutsourceIssueLine); + + /** + * 修改外协领料单行 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 结果 + */ + public int updateWmOutsourceIssueLine(WmOutsourceIssueLine wmOutsourceIssueLine); + + /** + * 删除外协领料单行 + * + * @param lineId 外协领料单行主键 + * @return 结果 + */ + public int deleteWmOutsourceIssueLineByLineId(Long lineId); + + /** + * 批量删除外协领料单行 + * + * @param lineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmOutsourceIssueLineByLineIds(Long[] lineIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java new file mode 100644 index 0000000..d16891e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceIssueMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceIssue; + +/** + * 外协领料单头Mapper接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface WmOutsourceIssueMapper +{ + /** + * 查询外协领料单头 + * + * @param issueId 外协领料单头主键 + * @return 外协领料单头 + */ + public WmOutsourceIssue selectWmOutsourceIssueByIssueId(Long issueId); + + /** + * 查询外协领料单头列表 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 外协领料单头集合 + */ + public List selectWmOutsourceIssueList(WmOutsourceIssue wmOutsourceIssue); + + /** + * 新增外协领料单头 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 结果 + */ + public int insertWmOutsourceIssue(WmOutsourceIssue wmOutsourceIssue); + + /** + * 修改外协领料单头 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 结果 + */ + public int updateWmOutsourceIssue(WmOutsourceIssue wmOutsourceIssue); + + /** + * 删除外协领料单头 + * + * @param issueId 外协领料单头主键 + * @return 结果 + */ + public int deleteWmOutsourceIssueByIssueId(Long issueId); + + /** + * 批量删除外协领料单头 + * + * @param issueIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmOutsourceIssueByIssueIds(Long[] issueIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptLineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptLineMapper.java new file mode 100644 index 0000000..0bb96dd --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptLineMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceRecptLine; + +/** + * 外协入库单行Mapper接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface WmOutsourceRecptLineMapper +{ + /** + * 查询外协入库单行 + * + * @param lineId 外协入库单行主键 + * @return 外协入库单行 + */ + public WmOutsourceRecptLine selectWmOutsourceRecptLineByLineId(Long lineId); + + /** + * 查询外协入库单行列表 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 外协入库单行集合 + */ + public List selectWmOutsourceRecptLineList(WmOutsourceRecptLine wmOutsourceRecptLine); + + /** + * 新增外协入库单行 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 结果 + */ + public int insertWmOutsourceRecptLine(WmOutsourceRecptLine wmOutsourceRecptLine); + + /** + * 修改外协入库单行 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 结果 + */ + public int updateWmOutsourceRecptLine(WmOutsourceRecptLine wmOutsourceRecptLine); + + /** + * 删除外协入库单行 + * + * @param lineId 外协入库单行主键 + * @return 结果 + */ + public int deleteWmOutsourceRecptLineByLineId(Long lineId); + + /** + * 批量删除外协入库单行 + * + * @param lineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmOutsourceRecptLineByLineIds(Long[] lineIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java new file mode 100644 index 0000000..19d3963 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmOutsourceRecptMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceRecpt; + +/** + * 外协入库单Mapper接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface WmOutsourceRecptMapper +{ + /** + * 查询外协入库单 + * + * @param recptId 外协入库单主键 + * @return 外协入库单 + */ + public WmOutsourceRecpt selectWmOutsourceRecptByRecptId(Long recptId); + + /** + * 查询外协入库单列表 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 外协入库单集合 + */ + public List selectWmOutsourceRecptList(WmOutsourceRecpt wmOutsourceRecpt); + + /** + * 新增外协入库单 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 结果 + */ + public int insertWmOutsourceRecpt(WmOutsourceRecpt wmOutsourceRecpt); + + /** + * 修改外协入库单 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 结果 + */ + public int updateWmOutsourceRecpt(WmOutsourceRecpt wmOutsourceRecpt); + + /** + * 删除外协入库单 + * + * @param recptId 外协入库单主键 + * @return 结果 + */ + public int deleteWmOutsourceRecptByRecptId(Long recptId); + + /** + * 批量删除外协入库单 + * + * @param recptIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmOutsourceRecptByRecptIds(Long[] recptIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueLineService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueLineService.java new file mode 100644 index 0000000..ff65684 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueLineService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceIssueLine; + +/** + * 外协领料单行Service接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface IWmOutsourceIssueLineService +{ + /** + * 查询外协领料单行 + * + * @param lineId 外协领料单行主键 + * @return 外协领料单行 + */ + public WmOutsourceIssueLine selectWmOutsourceIssueLineByLineId(Long lineId); + + /** + * 查询外协领料单行列表 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 外协领料单行集合 + */ + public List selectWmOutsourceIssueLineList(WmOutsourceIssueLine wmOutsourceIssueLine); + + /** + * 新增外协领料单行 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 结果 + */ + public int insertWmOutsourceIssueLine(WmOutsourceIssueLine wmOutsourceIssueLine); + + /** + * 修改外协领料单行 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 结果 + */ + public int updateWmOutsourceIssueLine(WmOutsourceIssueLine wmOutsourceIssueLine); + + /** + * 批量删除外协领料单行 + * + * @param lineIds 需要删除的外协领料单行主键集合 + * @return 结果 + */ + public int deleteWmOutsourceIssueLineByLineIds(Long[] lineIds); + + /** + * 删除外协领料单行信息 + * + * @param lineId 外协领料单行主键 + * @return 结果 + */ + public int deleteWmOutsourceIssueLineByLineId(Long lineId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java new file mode 100644 index 0000000..0062280 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceIssueService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceIssue; + +/** + * 外协领料单头Service接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface IWmOutsourceIssueService +{ + /** + * 查询外协领料单头 + * + * @param issueId 外协领料单头主键 + * @return 外协领料单头 + */ + public WmOutsourceIssue selectWmOutsourceIssueByIssueId(Long issueId); + + /** + * 查询外协领料单头列表 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 外协领料单头集合 + */ + public List selectWmOutsourceIssueList(WmOutsourceIssue wmOutsourceIssue); + + /** + * 新增外协领料单头 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 结果 + */ + public int insertWmOutsourceIssue(WmOutsourceIssue wmOutsourceIssue); + + /** + * 修改外协领料单头 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 结果 + */ + public int updateWmOutsourceIssue(WmOutsourceIssue wmOutsourceIssue); + + /** + * 批量删除外协领料单头 + * + * @param issueIds 需要删除的外协领料单头主键集合 + * @return 结果 + */ + public int deleteWmOutsourceIssueByIssueIds(Long[] issueIds); + + /** + * 删除外协领料单头信息 + * + * @param issueId 外协领料单头主键 + * @return 结果 + */ + public int deleteWmOutsourceIssueByIssueId(Long issueId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptLineService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptLineService.java new file mode 100644 index 0000000..ada3c70 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptLineService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceRecptLine; + +/** + * 外协入库单行Service接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface IWmOutsourceRecptLineService +{ + /** + * 查询外协入库单行 + * + * @param lineId 外协入库单行主键 + * @return 外协入库单行 + */ + public WmOutsourceRecptLine selectWmOutsourceRecptLineByLineId(Long lineId); + + /** + * 查询外协入库单行列表 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 外协入库单行集合 + */ + public List selectWmOutsourceRecptLineList(WmOutsourceRecptLine wmOutsourceRecptLine); + + /** + * 新增外协入库单行 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 结果 + */ + public int insertWmOutsourceRecptLine(WmOutsourceRecptLine wmOutsourceRecptLine); + + /** + * 修改外协入库单行 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 结果 + */ + public int updateWmOutsourceRecptLine(WmOutsourceRecptLine wmOutsourceRecptLine); + + /** + * 批量删除外协入库单行 + * + * @param lineIds 需要删除的外协入库单行主键集合 + * @return 结果 + */ + public int deleteWmOutsourceRecptLineByLineIds(Long[] lineIds); + + /** + * 删除外协入库单行信息 + * + * @param lineId 外协入库单行主键 + * @return 结果 + */ + public int deleteWmOutsourceRecptLineByLineId(Long lineId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java new file mode 100644 index 0000000..fe0a5b8 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmOutsourceRecptService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmOutsourceRecpt; + +/** + * 外协入库单Service接口 + * + * @author yinjinlu + * @date 2023-10-30 + */ +public interface IWmOutsourceRecptService +{ + /** + * 查询外协入库单 + * + * @param recptId 外协入库单主键 + * @return 外协入库单 + */ + public WmOutsourceRecpt selectWmOutsourceRecptByRecptId(Long recptId); + + /** + * 查询外协入库单列表 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 外协入库单集合 + */ + public List selectWmOutsourceRecptList(WmOutsourceRecpt wmOutsourceRecpt); + + /** + * 新增外协入库单 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 结果 + */ + public int insertWmOutsourceRecpt(WmOutsourceRecpt wmOutsourceRecpt); + + /** + * 修改外协入库单 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 结果 + */ + public int updateWmOutsourceRecpt(WmOutsourceRecpt wmOutsourceRecpt); + + /** + * 批量删除外协入库单 + * + * @param recptIds 需要删除的外协入库单主键集合 + * @return 结果 + */ + public int deleteWmOutsourceRecptByRecptIds(Long[] recptIds); + + /** + * 删除外协入库单信息 + * + * @param recptId 外协入库单主键 + * @return 结果 + */ + public int deleteWmOutsourceRecptByRecptId(Long recptId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueLineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueLineServiceImpl.java new file mode 100644 index 0000000..3b71169 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueLineServiceImpl.java @@ -0,0 +1,96 @@ +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.WmOutsourceIssueLineMapper; +import com.ktg.mes.wm.domain.WmOutsourceIssueLine; +import com.ktg.mes.wm.service.IWmOutsourceIssueLineService; + +/** + * 外协领料单行Service业务层处理 + * + * @author yinjinlu + * @date 2023-10-30 + */ +@Service +public class WmOutsourceIssueLineServiceImpl implements IWmOutsourceIssueLineService +{ + @Autowired + private WmOutsourceIssueLineMapper wmOutsourceIssueLineMapper; + + /** + * 查询外协领料单行 + * + * @param lineId 外协领料单行主键 + * @return 外协领料单行 + */ + @Override + public WmOutsourceIssueLine selectWmOutsourceIssueLineByLineId(Long lineId) + { + return wmOutsourceIssueLineMapper.selectWmOutsourceIssueLineByLineId(lineId); + } + + /** + * 查询外协领料单行列表 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 外协领料单行 + */ + @Override + public List selectWmOutsourceIssueLineList(WmOutsourceIssueLine wmOutsourceIssueLine) + { + return wmOutsourceIssueLineMapper.selectWmOutsourceIssueLineList(wmOutsourceIssueLine); + } + + /** + * 新增外协领料单行 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 结果 + */ + @Override + public int insertWmOutsourceIssueLine(WmOutsourceIssueLine wmOutsourceIssueLine) + { + wmOutsourceIssueLine.setCreateTime(DateUtils.getNowDate()); + return wmOutsourceIssueLineMapper.insertWmOutsourceIssueLine(wmOutsourceIssueLine); + } + + /** + * 修改外协领料单行 + * + * @param wmOutsourceIssueLine 外协领料单行 + * @return 结果 + */ + @Override + public int updateWmOutsourceIssueLine(WmOutsourceIssueLine wmOutsourceIssueLine) + { + wmOutsourceIssueLine.setUpdateTime(DateUtils.getNowDate()); + return wmOutsourceIssueLineMapper.updateWmOutsourceIssueLine(wmOutsourceIssueLine); + } + + /** + * 批量删除外协领料单行 + * + * @param lineIds 需要删除的外协领料单行主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceIssueLineByLineIds(Long[] lineIds) + { + return wmOutsourceIssueLineMapper.deleteWmOutsourceIssueLineByLineIds(lineIds); + } + + /** + * 删除外协领料单行信息 + * + * @param lineId 外协领料单行主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceIssueLineByLineId(Long lineId) + { + return wmOutsourceIssueLineMapper.deleteWmOutsourceIssueLineByLineId(lineId); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java new file mode 100644 index 0000000..16fe459 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceIssueServiceImpl.java @@ -0,0 +1,96 @@ +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.WmOutsourceIssueMapper; +import com.ktg.mes.wm.domain.WmOutsourceIssue; +import com.ktg.mes.wm.service.IWmOutsourceIssueService; + +/** + * 外协领料单头Service业务层处理 + * + * @author yinjinlu + * @date 2023-10-30 + */ +@Service +public class WmOutsourceIssueServiceImpl implements IWmOutsourceIssueService +{ + @Autowired + private WmOutsourceIssueMapper wmOutsourceIssueMapper; + + /** + * 查询外协领料单头 + * + * @param issueId 外协领料单头主键 + * @return 外协领料单头 + */ + @Override + public WmOutsourceIssue selectWmOutsourceIssueByIssueId(Long issueId) + { + return wmOutsourceIssueMapper.selectWmOutsourceIssueByIssueId(issueId); + } + + /** + * 查询外协领料单头列表 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 外协领料单头 + */ + @Override + public List selectWmOutsourceIssueList(WmOutsourceIssue wmOutsourceIssue) + { + return wmOutsourceIssueMapper.selectWmOutsourceIssueList(wmOutsourceIssue); + } + + /** + * 新增外协领料单头 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 结果 + */ + @Override + public int insertWmOutsourceIssue(WmOutsourceIssue wmOutsourceIssue) + { + wmOutsourceIssue.setCreateTime(DateUtils.getNowDate()); + return wmOutsourceIssueMapper.insertWmOutsourceIssue(wmOutsourceIssue); + } + + /** + * 修改外协领料单头 + * + * @param wmOutsourceIssue 外协领料单头 + * @return 结果 + */ + @Override + public int updateWmOutsourceIssue(WmOutsourceIssue wmOutsourceIssue) + { + wmOutsourceIssue.setUpdateTime(DateUtils.getNowDate()); + return wmOutsourceIssueMapper.updateWmOutsourceIssue(wmOutsourceIssue); + } + + /** + * 批量删除外协领料单头 + * + * @param issueIds 需要删除的外协领料单头主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceIssueByIssueIds(Long[] issueIds) + { + return wmOutsourceIssueMapper.deleteWmOutsourceIssueByIssueIds(issueIds); + } + + /** + * 删除外协领料单头信息 + * + * @param issueId 外协领料单头主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceIssueByIssueId(Long issueId) + { + return wmOutsourceIssueMapper.deleteWmOutsourceIssueByIssueId(issueId); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptLineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptLineServiceImpl.java new file mode 100644 index 0000000..5b554a7 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptLineServiceImpl.java @@ -0,0 +1,96 @@ +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.WmOutsourceRecptLineMapper; +import com.ktg.mes.wm.domain.WmOutsourceRecptLine; +import com.ktg.mes.wm.service.IWmOutsourceRecptLineService; + +/** + * 外协入库单行Service业务层处理 + * + * @author yinjinlu + * @date 2023-10-30 + */ +@Service +public class WmOutsourceRecptLineServiceImpl implements IWmOutsourceRecptLineService +{ + @Autowired + private WmOutsourceRecptLineMapper wmOutsourceRecptLineMapper; + + /** + * 查询外协入库单行 + * + * @param lineId 外协入库单行主键 + * @return 外协入库单行 + */ + @Override + public WmOutsourceRecptLine selectWmOutsourceRecptLineByLineId(Long lineId) + { + return wmOutsourceRecptLineMapper.selectWmOutsourceRecptLineByLineId(lineId); + } + + /** + * 查询外协入库单行列表 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 外协入库单行 + */ + @Override + public List selectWmOutsourceRecptLineList(WmOutsourceRecptLine wmOutsourceRecptLine) + { + return wmOutsourceRecptLineMapper.selectWmOutsourceRecptLineList(wmOutsourceRecptLine); + } + + /** + * 新增外协入库单行 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 结果 + */ + @Override + public int insertWmOutsourceRecptLine(WmOutsourceRecptLine wmOutsourceRecptLine) + { + wmOutsourceRecptLine.setCreateTime(DateUtils.getNowDate()); + return wmOutsourceRecptLineMapper.insertWmOutsourceRecptLine(wmOutsourceRecptLine); + } + + /** + * 修改外协入库单行 + * + * @param wmOutsourceRecptLine 外协入库单行 + * @return 结果 + */ + @Override + public int updateWmOutsourceRecptLine(WmOutsourceRecptLine wmOutsourceRecptLine) + { + wmOutsourceRecptLine.setUpdateTime(DateUtils.getNowDate()); + return wmOutsourceRecptLineMapper.updateWmOutsourceRecptLine(wmOutsourceRecptLine); + } + + /** + * 批量删除外协入库单行 + * + * @param lineIds 需要删除的外协入库单行主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceRecptLineByLineIds(Long[] lineIds) + { + return wmOutsourceRecptLineMapper.deleteWmOutsourceRecptLineByLineIds(lineIds); + } + + /** + * 删除外协入库单行信息 + * + * @param lineId 外协入库单行主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceRecptLineByLineId(Long lineId) + { + return wmOutsourceRecptLineMapper.deleteWmOutsourceRecptLineByLineId(lineId); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java new file mode 100644 index 0000000..513ca3d --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmOutsourceRecptServiceImpl.java @@ -0,0 +1,96 @@ +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.WmOutsourceRecptMapper; +import com.ktg.mes.wm.domain.WmOutsourceRecpt; +import com.ktg.mes.wm.service.IWmOutsourceRecptService; + +/** + * 外协入库单Service业务层处理 + * + * @author yinjinlu + * @date 2023-10-30 + */ +@Service +public class WmOutsourceRecptServiceImpl implements IWmOutsourceRecptService +{ + @Autowired + private WmOutsourceRecptMapper wmOutsourceRecptMapper; + + /** + * 查询外协入库单 + * + * @param recptId 外协入库单主键 + * @return 外协入库单 + */ + @Override + public WmOutsourceRecpt selectWmOutsourceRecptByRecptId(Long recptId) + { + return wmOutsourceRecptMapper.selectWmOutsourceRecptByRecptId(recptId); + } + + /** + * 查询外协入库单列表 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 外协入库单 + */ + @Override + public List selectWmOutsourceRecptList(WmOutsourceRecpt wmOutsourceRecpt) + { + return wmOutsourceRecptMapper.selectWmOutsourceRecptList(wmOutsourceRecpt); + } + + /** + * 新增外协入库单 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 结果 + */ + @Override + public int insertWmOutsourceRecpt(WmOutsourceRecpt wmOutsourceRecpt) + { + wmOutsourceRecpt.setCreateTime(DateUtils.getNowDate()); + return wmOutsourceRecptMapper.insertWmOutsourceRecpt(wmOutsourceRecpt); + } + + /** + * 修改外协入库单 + * + * @param wmOutsourceRecpt 外协入库单 + * @return 结果 + */ + @Override + public int updateWmOutsourceRecpt(WmOutsourceRecpt wmOutsourceRecpt) + { + wmOutsourceRecpt.setUpdateTime(DateUtils.getNowDate()); + return wmOutsourceRecptMapper.updateWmOutsourceRecpt(wmOutsourceRecpt); + } + + /** + * 批量删除外协入库单 + * + * @param recptIds 需要删除的外协入库单主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceRecptByRecptIds(Long[] recptIds) + { + return wmOutsourceRecptMapper.deleteWmOutsourceRecptByRecptIds(recptIds); + } + + /** + * 删除外协入库单信息 + * + * @param recptId 外协入库单主键 + * @return 结果 + */ + @Override + public int deleteWmOutsourceRecptByRecptId(Long recptId) + { + return wmOutsourceRecptMapper.deleteWmOutsourceRecptByRecptId(recptId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueLineMapper.xml new file mode 100644 index 0000000..1b98c1c --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueLineMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, 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_outsource_issue_line + + + + + + + + insert into wm_outsource_issue_line + + issue_id, + material_stock_id, + item_id, + item_code, + item_name, + specification, + unit_of_measure, + quantity_issued, + 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, + + + #{issueId}, + #{materialStockId}, + #{itemId}, + #{itemCode}, + #{itemName}, + #{specification}, + #{unitOfMeasure}, + #{quantityIssued}, + #{batchCode}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_outsource_issue_line + + issue_id = #{issueId}, + material_stock_id = #{materialStockId}, + item_id = #{itemId}, + item_code = #{itemCode}, + item_name = #{itemName}, + specification = #{specification}, + unit_of_measure = #{unitOfMeasure}, + quantity_issued = #{quantityIssued}, + 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_outsource_issue_line where line_id = #{lineId} + + + + delete from wm_outsource_issue_line where line_id in + + #{lineId} + + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml new file mode 100644 index 0000000..16cfa39 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueMapper.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select issue_id, issue_code, issue_name, workorder_id, workorder_code, vendor_id, vendor_code, vendor_name, vendor_nick, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, issue_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue + + + + + + + + insert into wm_outsource_issue + + issue_code, + issue_name, + workorder_id, + workorder_code, + vendor_id, + vendor_code, + vendor_name, + vendor_nick, + warehouse_id, + warehouse_code, + warehouse_name, + location_id, + location_code, + location_name, + area_id, + area_code, + area_name, + issue_date, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{issueCode}, + #{issueName}, + #{workorderId}, + #{workorderCode}, + #{vendorId}, + #{vendorCode}, + #{vendorName}, + #{vendorNick}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{issueDate}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_outsource_issue + + issue_code = #{issueCode}, + issue_name = #{issueName}, + workorder_id = #{workorderId}, + workorder_code = #{workorderCode}, + vendor_id = #{vendorId}, + vendor_code = #{vendorCode}, + vendor_name = #{vendorName}, + vendor_nick = #{vendorNick}, + 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}, + issue_date = #{issueDate}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where issue_id = #{issueId} + + + + delete from wm_outsource_issue where issue_id = #{issueId} + + + + delete from wm_outsource_issue where issue_id in + + #{issueId} + + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml new file mode 100644 index 0000000..942de91 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select line_id, recpt_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, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line + + + + + + + + insert into wm_outsource_recpt_line + + recpt_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, + expire_date, + iqc_check, + iqc_id, + iqc_code, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{recptId}, + #{itemId}, + #{itemCode}, + #{itemName}, + #{specification}, + #{unitOfMeasure}, + #{quantityRecived}, + #{batchCode}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{expireDate}, + #{iqcCheck}, + #{iqcId}, + #{iqcCode}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_outsource_recpt_line + + recpt_id = #{recptId}, + 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}, + expire_date = #{expireDate}, + iqc_check = #{iqcCheck}, + iqc_id = #{iqcId}, + iqc_code = #{iqcCode}, + 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_outsource_recpt_line where line_id = #{lineId} + + + + delete from wm_outsource_recpt_line where line_id in + + #{lineId} + + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml new file mode 100644 index 0000000..6300a76 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptMapper.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select recpt_id, recpt_code, recpt_name, iqc_id, iqc_code, workorder_id, workorder_code, vendor_id, vendor_code, vendor_name, vendor_nick, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, recpt_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt + + + + + + + + insert into wm_outsource_recpt + + recpt_code, + recpt_name, + iqc_id, + iqc_code, + workorder_id, + workorder_code, + vendor_id, + vendor_code, + vendor_name, + vendor_nick, + warehouse_id, + warehouse_code, + warehouse_name, + location_id, + location_code, + location_name, + area_id, + area_code, + area_name, + recpt_date, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{recptCode}, + #{recptName}, + #{iqcId}, + #{iqcCode}, + #{workorderId}, + #{workorderCode}, + #{vendorId}, + #{vendorCode}, + #{vendorName}, + #{vendorNick}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{recptDate}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_outsource_recpt + + recpt_code = #{recptCode}, + recpt_name = #{recptName}, + iqc_id = #{iqcId}, + iqc_code = #{iqcCode}, + workorder_id = #{workorderId}, + workorder_code = #{workorderCode}, + vendor_id = #{vendorId}, + vendor_code = #{vendorCode}, + vendor_name = #{vendorName}, + vendor_nick = #{vendorNick}, + 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}, + recpt_date = #{recptDate}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where recpt_id = #{recptId} + + + + delete from wm_outsource_recpt where recpt_id = #{recptId} + + + + delete from wm_outsource_recpt where recpt_id in + + #{recptId} + + + \ No newline at end of file