Merge branch 'wq' of kn-cost/cost-backend into dev

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java

@@ -0,0 +1,180 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.LatestPurchasePrice;
+import com.zzsmart.qomo.kn.cost.manage.service.ILatestPurchasePriceService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+
+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.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: latest_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+@Api(tags="最新采购价")
+@RestController
+@RequestMapping("//latestPurchasePrice")
+@Slf4j
+public class LatestPurchasePriceController extends JeecgController<LatestPurchasePrice, ILatestPurchasePriceService> {
+	@Autowired
+	private ILatestPurchasePriceService latestPurchasePriceService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param latestPurchasePrice
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "latest_purchase_price-分页列表查询")
+	@ApiOperation(value="latest_purchase_price-分页列表查询", notes="latest_purchase_price-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<LatestPurchasePrice>> queryPageList(LatestPurchasePrice latestPurchasePrice,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LatestPurchasePrice> queryWrapper = QueryGenerator.initQueryWrapper(latestPurchasePrice, req.getParameterMap());
+		Page<LatestPurchasePrice> page = new Page<LatestPurchasePrice>(pageNo, pageSize);
+		IPage<LatestPurchasePrice> pageList = latestPurchasePriceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param latestPurchasePrice
+	 * @return
+	 */
+	@AutoLog(value = "latest_purchase_price-添加")
+	@ApiOperation(value="latest_purchase_price-添加", notes="latest_purchase_price-添加")
+//	@RequiresPermissions(":latest_purchase_price:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody LatestPurchasePrice latestPurchasePrice) {
+		latestPurchasePriceService.save(latestPurchasePrice);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param latestPurchasePrice
+	 * @return
+	 */
+	@AutoLog(value = "latest_purchase_price-编辑")
+	@ApiOperation(value="latest_purchase_price-编辑", notes="latest_purchase_price-编辑")
+//	@RequiresPermissions(":latest_purchase_price:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody LatestPurchasePrice latestPurchasePrice) {
+		latestPurchasePriceService.updateById(latestPurchasePrice);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "latest_purchase_price-通过id删除")
+	@ApiOperation(value="latest_purchase_price-通过id删除", notes="latest_purchase_price-通过id删除")
+//	@RequiresPermissions(":latest_purchase_price:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		latestPurchasePriceService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "latest_purchase_price-批量删除")
+	@ApiOperation(value="latest_purchase_price-批量删除", notes="latest_purchase_price-批量删除")
+//	@RequiresPermissions(":latest_purchase_price:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.latestPurchasePriceService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "latest_purchase_price-通过id查询")
+	@ApiOperation(value="latest_purchase_price-通过id查询", notes="latest_purchase_price-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<LatestPurchasePrice> queryById(@RequestParam(name="id",required=true) String id) {
+		LatestPurchasePrice latestPurchasePrice = latestPurchasePriceService.getById(id);
+		if(latestPurchasePrice==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(latestPurchasePrice);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param latestPurchasePrice
+    */
+    @RequiresPermissions(":latest_purchase_price:exportXls")
+    @RequestMapping(value = "/exportXls", method = RequestMethod.GET)
+    public ModelAndView exportXls(HttpServletRequest request, LatestPurchasePrice latestPurchasePrice) {
+        return super.exportXls(request, latestPurchasePrice, LatestPurchasePrice.class, "latest_purchase_price");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+//    @RequiresPermissions(":latest_purchase_price:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LatestPurchasePrice.class);
+    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java

@@ -1,5 +1,6 @@
 package com.zzsmart.qomo.kn.cost.manage.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -134,7 +135,7 @@ public class ProduceBatchController extends JeecgController<ProduceBatch, IProdu
 		this.produceBatchService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -171,7 +172,7 @@ public class ProduceBatchController extends JeecgController<ProduceBatch, IProdu
     * @param response
     * @return
     */
-    @RequiresPermissions(":produce_batch:importExcel")
+//    @RequiresPermissions(":produce_batch:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, ProduceBatch.class);

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/LatestPurchasePrice.java

@@ -0,0 +1,107 @@
+package com.zzsmart.qomo.kn.cost.manage.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 com.baomidou.mybatisplus.annotation.TableLogic;
+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: latest_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("latest_purchase_price")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="latest_purchase_price对象", description="latest_purchase_price")
+public class LatestPurchasePrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**门控料号（物料id）*/
+	@Excel(name = "门控料号（物料id）", width = 15)
+    @ApiModelProperty(value = "门控料号（物料id）")
+    private String materialNumber;
+	/**产品名称*/
+	@Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private String name;
+	/**规格*/
+	@Excel(name = "规格", width = 15)
+    @ApiModelProperty(value = "规格")
+    private String norms;
+	/**单位*/
+	@Excel(name = "单位", width = 15)
+    @ApiModelProperty(value = "单位")
+    private String unit;
+	/**latestInvoiceNo*/
+	@Excel(name = "latestInvoiceNo", width = 15)
+    @ApiModelProperty(value = "latestInvoiceNo")
+    private String latestInvoiceNo;
+	/**估算日期*/
+	@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 latestInvoiceDate;
+	/**latestInvoiceSupplier*/
+	@Excel(name = "latestInvoiceSupplier", width = 15)
+    @ApiModelProperty(value = "latestInvoiceSupplier")
+    private String latestInvoiceSupplier;
+	/**latestInvoicePrice*/
+	@Excel(name = "latestInvoicePrice", width = 15)
+    @ApiModelProperty(value = "latestInvoicePrice")
+    private BigDecimal latestInvoicePrice;
+	/**不含税价格*/
+	@Excel(name = "不含税价格", width = 15)
+    @ApiModelProperty(value = "不含税价格")
+    private BigDecimal unitPriceWithoutTax;
+	/**interExamCost*/
+	@Excel(name = "interExamCost", width = 15)
+    @ApiModelProperty(value = "interExamCost")
+    private BigDecimal interExamCost;
+	/**工厂代号（工厂id）*/
+	@Excel(name = "工厂代号（工厂id）", width = 15)
+    @ApiModelProperty(value = "工厂代号（工厂id）")
+    private String factory;
+	/**维护人*/
+	@Excel(name = "维护人", width = 15)
+    @ApiModelProperty(value = "维护人")
+    private String guardian;
+	/**维护时间*/
+	@Excel(name = "维护时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "维护时间")
+    private Date maintenanceTime;
+	/**isadd*/
+	@Excel(name = "isadd", width = 15)
+    @ApiModelProperty(value = "isadd")
+    private Integer isadd;
+	/**采购类型*/
+	@Excel(name = "采购类型", width = 15)
+    @ApiModelProperty(value = "采购类型")
+    private String purchaseType;
+	/**是否启用*/
+	@Excel(name = "是否启用", width = 15)
+    @ApiModelProperty(value = "是否启用")
+    private Integer isinvalid;
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/ProduceBatch.java

@@ -55,7 +55,11 @@ public class ProduceBatch implements Serializable {
     @ApiModelProperty(value = "维护时间")
     private Date maintenanceTime;
 	/**aufnr*/
-	@Excel(name = "aufnr", width = 15)
+//	@Excel(name = "aufnr", width = 15)
     @ApiModelProperty(value = "aufnr")
     private String aufnr;
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/LatestPurchasePriceMapper.java

@@ -0,0 +1,18 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import java.util.List;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.LatestPurchasePrice;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: latest_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+public interface LatestPurchasePriceMapper extends BaseMapper<LatestPurchasePrice> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/LatestPurchasePriceMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.zzsmart.qomo.kn.cost.manage.mapper.LatestPurchasePriceMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ILatestPurchasePriceService.java

@@ -0,0 +1,15 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.LatestPurchasePrice;
+
+/**
+ * @Description: latest_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+public interface ILatestPurchasePriceService extends IService<LatestPurchasePrice> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/LatestPurchasePriceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+
+import com.zzsmart.qomo.kn.cost.manage.entity.LatestPurchasePrice;
+import com.zzsmart.qomo.kn.cost.manage.mapper.LatestPurchasePriceMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.ILatestPurchasePriceService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: latest_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+@Service
+public class LatestPurchasePriceServiceImpl extends ServiceImpl<LatestPurchasePriceMapper, LatestPurchasePrice> implements ILatestPurchasePriceService {
+
+}