不良品退料

docker-compose-server.yml

@@ -40,7 +40,7 @@ services:
     container_name: oztsystem-system
     volumes:
       - /data/config:/oztsystem/config
-  - /data/storage:/oztsystem/storage
+      - /data/storage:/oztsystem/storage
     ports:
       - 8082:8082
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/ImsReturnMaterialDefectiveProductsController.java

+package org.jeecg.modules.iost.ims.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+
+import org.jeecg.modules.iost.ims.entity.ImsReturnMaterialDefectiveProducts;
+import org.jeecg.modules.iost.ims.service.IImsReturnMaterialDefectiveProductsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 不良品退料
+ * @Author: jeecg-boot
+ * @Date:   2021-12-02
+ * @Version: V1.0
+ */
+@Api(tags="不良品退料")
+@RestController
+@RequestMapping("/ims/returnMaterialDefectiveProducts")
+@Slf4j
+public class ImsReturnMaterialDefectiveProductsController extends JeecgController<ImsReturnMaterialDefectiveProducts, IImsReturnMaterialDefectiveProductsService> {
+	@Autowired
+	private IImsReturnMaterialDefectiveProductsService returnMaterialDefectiveProductsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param returnMaterialDefectiveProducts
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "不良品退料-分页列表查询")
+	@ApiOperation(value="不良品退料-分页列表查询", notes="不良品退料-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(ImsReturnMaterialDefectiveProducts returnMaterialDefectiveProducts,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ImsReturnMaterialDefectiveProducts> queryWrapper = QueryGenerator.initQueryWrapper(returnMaterialDefectiveProducts, req.getParameterMap());
+		Page<ImsReturnMaterialDefectiveProducts> page = new Page<ImsReturnMaterialDefectiveProducts>(pageNo, pageSize);
+		IPage<ImsReturnMaterialDefectiveProducts> pageList = returnMaterialDefectiveProductsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param returnMaterialDefectiveProducts
+	 * @return
+	 */
+	@AutoLog(value = "不良品退料-添加")
+	@ApiOperation(value="不良品退料-添加", notes="不良品退料-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody ImsReturnMaterialDefectiveProducts returnMaterialDefectiveProducts) {
+		returnMaterialDefectiveProductsService.save(returnMaterialDefectiveProducts);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param returnMaterialDefectiveProducts
+	 * @return
+	 */
+	@AutoLog(value = "不良品退料-编辑")
+	@ApiOperation(value="不良品退料-编辑", notes="不良品退料-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody ImsReturnMaterialDefectiveProducts returnMaterialDefectiveProducts) {
+		returnMaterialDefectiveProductsService.updateById(returnMaterialDefectiveProducts);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "不良品退料-通过id删除")
+	@ApiOperation(value="不良品退料-通过id删除", notes="不良品退料-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		returnMaterialDefectiveProductsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "不良品退料-批量删除")
+	@ApiOperation(value="不良品退料-批量删除", notes="不良品退料-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.returnMaterialDefectiveProductsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "不良品退料-通过id查询")
+	@ApiOperation(value="不良品退料-通过id查询", notes="不良品退料-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ImsReturnMaterialDefectiveProducts returnMaterialDefectiveProducts = returnMaterialDefectiveProductsService.getById(id);
+		if(returnMaterialDefectiveProducts==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(returnMaterialDefectiveProducts);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param returnMaterialDefectiveProducts
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ImsReturnMaterialDefectiveProducts returnMaterialDefectiveProducts) {
+        return super.exportXls(request, returnMaterialDefectiveProducts, ImsReturnMaterialDefectiveProducts.class, "不良品退料");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ImsReturnMaterialDefectiveProducts.class);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/entity/ImsReturnMaterialDefectiveProducts.java

+package org.jeecg.modules.iost.ims.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 不良品退料
+ * @Author: jeecg-boot
+ * @Date:   2021-12-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("return_material_defective_products")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="return_material_defective_products对象", description="不良品退料")
+public class ImsReturnMaterialDefectiveProducts implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**唯一序号*/
+	@Excel(name = "唯一序号", width = 15)
+    @ApiModelProperty(value = "唯一序号")
+    private String queueId;
+	/**交易时间*/
+	@Excel(name = "交易时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "交易时间")
+    private Date trxDate;
+	/**操作人编码*/
+	@Excel(name = "操作人编码", width = 15)
+    @ApiModelProperty(value = "操作人编码")
+    private String userCode;
+	/**组织代码*/
+	@Excel(name = "组织代码", width = 15)
+    @ApiModelProperty(value = "组织代码")
+    private String orgId;
+	/**仓库编码*/
+	@Excel(name = "仓库编码", width = 15)
+    @ApiModelProperty(value = "仓库编码")
+    private String storeCode;
+	/**物料编码*/
+	@Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private String mtrlCode;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private Integer quantity;
+	/**工单编码*/
+	@Excel(name = "工单编码", width = 15)
+    @ApiModelProperty(value = "工单编码")
+    private String moCode;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/mapper/ImsReturnMaterialDefectiveProductsMapper.java

+package org.jeecg.modules.iost.ims.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.iost.ims.entity.ImsReturnMaterialDefectiveProducts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 不良品退料
+ * @Author: jeecg-boot
+ * @Date:   2021-12-02
+ * @Version: V1.0
+ */
+public interface ImsReturnMaterialDefectiveProductsMapper extends BaseMapper<ImsReturnMaterialDefectiveProducts> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/mapper/xml/ImsReturnMaterialDefectiveProductsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.iost.ims.mapper.ImsReturnMaterialDefectiveProductsMapper">
+
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/IImsReturnMaterialDefectiveProductsService.java

+package org.jeecg.modules.iost.ims.service;
+
+import org.jeecg.modules.iost.ims.entity.ImsReturnMaterialDefectiveProducts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 不良品退料
+ * @Author: jeecg-boot
+ * @Date:   2021-12-02
+ * @Version: V1.0
+ */
+public interface IImsReturnMaterialDefectiveProductsService extends IService<ImsReturnMaterialDefectiveProducts> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsReturnMaterialDefectiveProductsServiceImpl.java

+package org.jeecg.modules.iost.ims.service.impl;
+
+import org.jeecg.modules.iost.ims.entity.ImsReturnMaterialDefectiveProducts;
+import org.jeecg.modules.iost.ims.mapper.ImsReturnMaterialDefectiveProductsMapper;
+import org.jeecg.modules.iost.ims.service.IImsReturnMaterialDefectiveProductsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 不良品退料
+ * @Author: jeecg-boot
+ * @Date:   2021-12-02
+ * @Version: V1.0
+ */
+@Service
+public class ImsReturnMaterialDefectiveProductsServiceImpl extends ServiceImpl<ImsReturnMaterialDefectiveProductsMapper, ImsReturnMaterialDefectiveProducts> implements IImsReturnMaterialDefectiveProductsService {
+
+}