diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawOutstockDetailController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawOutstockDetailController.java new file mode 100644 index 00000000..830ba0ba --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsRawOutstockDetailController.java @@ -0,0 +1,99 @@ +package com.hw.wms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +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.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.wms.domain.WmsRawOutstockDetail; +import com.hw.wms.service.IWmsRawOutstockDetailService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 原材料出库记录明细Controller + * + * @author Yinq + * @date 2025-06-19 + */ +@RestController +@RequestMapping("/rawOutstockDetail") +public class WmsRawOutstockDetailController extends BaseController { + @Autowired + private IWmsRawOutstockDetailService wmsRawOutstockDetailService; + + /** + * 查询原材料出库记录明细列表 + */ + @RequiresPermissions("wms:rawOutstockDetail:list") + @GetMapping("/list") + public TableDataInfo list(WmsRawOutstockDetail wmsRawOutstockDetail) { + startPage(); + List list = wmsRawOutstockDetailService.selectWmsRawOutstockDetailList(wmsRawOutstockDetail); + return getDataTable(list); + } + + /** + * 导出原材料出库记录明细列表 + */ + @RequiresPermissions("wms:rawOutstockDetail:export") + @Log(title = "原材料出库记录明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmsRawOutstockDetail wmsRawOutstockDetail) { + List list = wmsRawOutstockDetailService.selectWmsRawOutstockDetailList(wmsRawOutstockDetail); + ExcelUtil util = new ExcelUtil(WmsRawOutstockDetail.class); + util.exportExcel(response, list, "原材料出库记录明细数据"); + } + + /** + * 获取原材料出库记录明细详细信息 + */ + @RequiresPermissions("wms:rawOutstockDetail:query") + @GetMapping(value = "/{rawOutstockDetailId}") + public AjaxResult getInfo(@PathVariable("rawOutstockDetailId") Long rawOutstockDetailId) { + return success(wmsRawOutstockDetailService.selectWmsRawOutstockDetailByRawOutstockDetailId(rawOutstockDetailId)); + } + + /** + * 新增原材料出库记录明细 + */ + @RequiresPermissions("wms:rawOutstockDetail:add") + @Log(title = "原材料出库记录明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmsRawOutstockDetail wmsRawOutstockDetail) { + return toAjax(wmsRawOutstockDetailService.insertWmsRawOutstockDetail(wmsRawOutstockDetail)); + } + + /** + * 修改原材料出库记录明细 + */ + @RequiresPermissions("wms:rawOutstockDetail:edit") + @Log(title = "原材料出库记录明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmsRawOutstockDetail wmsRawOutstockDetail) { + return toAjax(wmsRawOutstockDetailService.updateWmsRawOutstockDetail(wmsRawOutstockDetail)); + } + + /** + * 删除原材料出库记录明细 + */ + @RequiresPermissions("wms:rawOutstockDetail:remove") + @Log(title = "原材料出库记录明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{rawOutstockDetailIds}") + public AjaxResult remove(@PathVariable Long[] rawOutstockDetailIds) { + return toAjax(wmsRawOutstockDetailService.deleteWmsRawOutstockDetailByRawOutstockDetailIds(rawOutstockDetailIds)); + } +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java index 9370e464..01219179 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java @@ -192,6 +192,50 @@ public class WmsRawOutstockDetail extends BaseEntity { /** 成品bom所在销售订单的项目号 */ private String tondBaseId; + /** 计划编号 */ + private String planCode; + + /** 计划明细编号 */ + private String planDetailCode; + + /** 销售订单Id */ + private Long saleOrderId; + + /** 销售订单编号 */ + private String saleorderCode; + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPlanDetailCode() { + return planDetailCode; + } + + public void setPlanDetailCode(String planDetailCode) { + this.planDetailCode = planDetailCode; + } + + public Long getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(Long saleOrderId) { + this.saleOrderId = saleOrderId; + } + + public String getSaleorderCode() { + return saleorderCode; + } + + public void setSaleorderCode(String saleorderCode) { + this.saleorderCode = saleorderCode; + } + public String getProductId() { return productId; } diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml index 44c24505..2b936cfa 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml @@ -39,40 +39,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + - select raw_outstock_detail_id, raw_outstock_id, location_code, material_barcode, material_id, instock_batch, material_production_Date, plan_amount, outstock_amount, execute_status, erp_status,erp_amount, outstock_person, outstock_time, outstock_way, machine_name, quality_status, create_by, create_date, update_by, update_date, stack_amount, tips from wms_raw_outstock_detail wrod + select wrod.raw_outstock_detail_id, + wrod.raw_outstock_id, + wrod.location_code, + wrod.material_barcode, + wrod.material_id, + wrod.instock_batch, + wrod.material_production_Date, + wrod.plan_amount, + wrod.outstock_amount, + wrod.execute_status, + wrod.erp_status, + wrod.erp_amount, + wrod.outstock_person, + wrod.outstock_time, + wrod.outstock_way, + wrod.machine_name, + wrod.quality_status, + wrod.create_by, + wrod.create_date, + wrod.update_by, + wrod.update_date, + wrod.stack_amount, + wrod.tips, + wro.task_code, + wro.plan_code, + wro.plan_detail_code, + mso.sale_order_id, + mso.saleorder_code, + mbmi.material_code, + mbmi.material_name + from wms_raw_outstock_detail wrod + left join wms_raw_outstock wro on wrod.raw_outstock_id = wro.raw_outstock_id + left join mes_sale_order mso on mso.sale_order_id = wro.sale_order_id + left join mes_base_material_info mbmi on mbmi.material_id = wrod.material_id @@ -165,8 +208,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/hw-ui/src/api/wms/rawOutstockDetail.js b/hw-ui/src/api/wms/rawOutstockDetail.js new file mode 100644 index 00000000..e33e8102 --- /dev/null +++ b/hw-ui/src/api/wms/rawOutstockDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询原材料出库记录明细列表 +export function listRawOutstockDetail(query) { + return request({ + url: '/wms/rawOutstockDetail/list', + method: 'get', + params: query + }) +} + +// 查询原材料出库记录明细详细 +export function getRawOutstockDetail(rawOutstockDetailId) { + return request({ + url: '/wms/rawOutstockDetail/' + rawOutstockDetailId, + method: 'get' + }) +} + +// 新增原材料出库记录明细 +export function addRawOutstockDetail(data) { + return request({ + url: '/wms/rawOutstockDetail', + method: 'post', + data: data + }) +} + +// 修改原材料出库记录明细 +export function updateRawOutstockDetail(data) { + return request({ + url: '/wms/rawOutstockDetail', + method: 'put', + data: data + }) +} + +// 删除原材料出库记录明细 +export function delRawOutstockDetail(rawOutstockDetailId) { + return request({ + url: '/wms/rawOutstockDetail/' + rawOutstockDetailId, + method: 'delete' + }) +} diff --git a/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue b/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue new file mode 100644 index 00000000..3c7e3069 --- /dev/null +++ b/hw-ui/src/views/wms/info/rawOutstockDetail/index.vue @@ -0,0 +1,551 @@ + + +