diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java new file mode 100644 index 00000000..d57ef8de --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java @@ -0,0 +1,99 @@ +package com.op.wms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.wms.service.IWmsProductPutService; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.wms.domain.WmsRuturnPutEmbryo; + +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 成品退货入库Controller + * + * @author Open Platform + * @date 2024-04-09 + */ +@RestController +@RequestMapping("/ruturn") +public class WmsRuturnPutEmbryoController extends BaseController { + @Autowired + private IWmsProductPutService wmsProductPutService; + +/** + * 查询成品退货入库列表 + */ +@RequiresPermissions("wms:ruturn:list") +@GetMapping("/list") + public TableDataInfo list(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { + startPage(); + List list = wmsProductPutService.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); + return getDataTable(list); + } + +// /** +// * 导出成品退货入库列表 +// */ +// @RequiresPermissions("wms:ruturn:export") +// @Log(title = "成品退货入库", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { +// List list = wmsRuturnPutEmbryoService.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); +// ExcelUtil util = new ExcelUtil(WmsRuturnPutEmbryo. class); +// util.exportExcel(response, list, "成品退货入库数据"); +// } +// +// /** +// * 获取成品退货入库详细信息 +// */ +// @RequiresPermissions("wms:ruturn:query") +// @GetMapping(value = "/{id}") +// public AjaxResult getInfo(@PathVariable("id") String id) { +// return success(wmsRuturnPutEmbryoService.selectWmsRuturnPutEmbryoById(id)); +// } +// +// /** +// * 新增成品退货入库 +// */ +// @RequiresPermissions("wms:ruturn:add") +// @Log(title = "成品退货入库", businessType = BusinessType.INSERT) +// @PostMapping +// public AjaxResult add(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { +// return toAjax(wmsRuturnPutEmbryoService.insertWmsRuturnPutEmbryo(wmsRuturnPutEmbryo)); +// } +// +// /** +// * 修改成品退货入库 +// */ +// @RequiresPermissions("wms:ruturn:edit") +// @Log(title = "成品退货入库", businessType = BusinessType.UPDATE) +// @PutMapping +// public AjaxResult edit(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { +// return toAjax(wmsRuturnPutEmbryoService.updateWmsRuturnPutEmbryo(wmsRuturnPutEmbryo)); +// } +// +// /** +// * 删除成品退货入库 +// */ +// @RequiresPermissions("wms:ruturn:remove") +// @Log(title = "成品退货入库", businessType = BusinessType.DELETE) +// @DeleteMapping("/{ids}") +// public AjaxResult remove(@PathVariable String[] ids) { +// return toAjax(wmsRuturnPutEmbryoService.deleteWmsRuturnPutEmbryoByIds(ids)); +// } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java index 022034ba..31f01906 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java @@ -14,4 +14,11 @@ public interface WmsRuturnPutEmbryoMapper { WmsRuturnPutEmbryo selectWmsRuturnPutEmbryoByid(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1); void insertWmsRuturnPutEmbryoMapperRecords(WmsRuturnPutEmbryo wmsProductPutRecords); + /** + * 查询成品退货入库列表 + * + * @param wmsRuturnPutEmbryo 成品退货入库 + * @return 成品退货入库集合 + */ + public List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index f1fd022d..2cf511ed 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -126,4 +126,6 @@ public interface IWmsProductPutService { WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn); String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 0c70f596..1313277f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1089,4 +1089,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } return result1; } + /** + * 查询成品退货入库列表 + * + * @param wmsRuturnPutEmbryo 成品退货入库 + * @return 成品退货入库 + */ + @Override + @DS("#header.poolName") + public List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { + return wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml index 93c536f8..f77bd2da 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml @@ -221,4 +221,95 @@ #{activeFlag}, + + + select id, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, speciFication as speciFication, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_ruturn_put_embryo + + +