From 168f55417f3b75b0edf33f8d564257d22bf93121 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 14:04:31 +0800
Subject: [PATCH] 删掉相关ifs代码
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 36 ---------
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 96 ------------------------
/dev/null | 74 ------------------
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 27 ------
4 files changed, 0 insertions(+), 233 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
deleted file mode 100644
index db5c582..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.ruoyi.basic.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 鍘熸潗鏂欐煡璇�, 鎺掗櫎浜嗕緵搴斿晢
- * @Author zhuo
- * @Date 2024/8/28
- */
-@Data
-public class IfsInventoryQuantityCheckDto implements Serializable {
-
- private Integer id;
-
- @ApiModelProperty("鍩�")
- private String contract;
-
- @ApiModelProperty("璁㈠崟鍙�")
- private String orderNo;
-
-
- @ApiModelProperty("琛屽彿")
- private String lineNo;
-
- @ApiModelProperty("涓嬭揪鍙�")
- private String releaseNo;
-
- @ApiModelProperty("鎺ユ敹鍙�")
- private Integer receiptNo;
-
- @ApiModelProperty("闆朵欢鍙�")
- private String partNo;
-
- @ApiModelProperty("闆朵欢鎻忚堪")
- private String partDesc;
-
- @ApiModelProperty("鐘舵�佹弿杩�")
- private String status;
-
- @ApiModelProperty("鐘舵��")
- private String statusDb;
-
- @ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
- private BigDecimal qtyArrived;
-
- @ApiModelProperty("宸叉楠岀殑璐拱鏁伴噺")
- private BigDecimal qtyInspected;
-
- @ApiModelProperty("瑕佹楠岀殑閲囪喘鏁伴噺")
- private BigDecimal qtyToInspect;
-
- @ApiModelProperty("鎶佃揪鐨勫簱瀛樻暟閲�")
- private BigDecimal invQtyInStore;
-
- @ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
- private BigDecimal purQtyInStore;
-
- @ApiModelProperty("閰嶇疆鏍囪瘑")
- private String configurationId;
-
- @ApiModelProperty("鎵瑰彿")
- private String lotBatchNo;
-
- @ApiModelProperty("wdr鍙�")
- private String waivDevRejNo;
-
- @ApiModelProperty("娲诲姩搴忓垪")
- private Integer activitySeq;
-
-
- @ApiModelProperty("搴忓垪鍙�")
- private String serialNo;
-
- @ApiModelProperty("搴撲綅鍙�")
- private String locationNo;
-
- @ApiModelProperty("鐗堟湰鍙�")
- private String engChgLevel;
-
- @ApiModelProperty("鎺ユ敹浜�")
- private String receiver;
-
- @ApiModelProperty("鎺ユ敹浜哄鍚�")
- private String receiverName;
-
- @ApiModelProperty("閲囪喘鍛�")
- private String buyerCode;
-
- @ApiModelProperty("閲囪喘鍛樺鍚�")
- private String buyerName;
-
- @ApiModelProperty("瀹為檯鍒拌揣鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime arriveDate;
-
- @ApiModelProperty("瀹為檯浜よ揣鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime deliveryDate;
-
- @ApiModelProperty("鐢熶骇鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime productDate;
-
- @ApiModelProperty("澶辨晥鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime invalidDate;
-
-
- @ApiModelProperty("瀹℃壒鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime approvedDate;
-
- @ApiModelProperty("閲囪喘鐢宠鍒涘缓浜�")
- private String reqCeater;
-
- @ApiModelProperty("閲囪喘鐢宠鍒涘缓浜哄鍚�")
- private String reqCeaterName;
-
- @ApiModelProperty("閲囪喘璁㈠崟琛屽娉�")
- private String lineRemarks;
-
- @ApiModelProperty("鍗曚綅")
- private String buyUnitMeas;
-
-
- private Integer isSource;
-
- private Integer number;
-
-
- private Integer state;
-
- @ApiModelProperty("鎺ユ敹鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime receiverDate;
-
- @ApiModelProperty("鏄惁涓洪娆″嚭鐜� 0 鍚� 1 鏄�")
- private Integer isFirst;
-
- @ApiModelProperty("鐩爣搴撲綅鍙�")
- private String toLocation;
-
- @ApiModelProperty("鏄惁鏄姤妫� 0 鍚� 1 鏄�")
- private Integer isInspect;
-
- @ApiModelProperty("鎶ユ浜�")
- private String declareUser;
-
-
- @ApiModelProperty("鎶ユ浜篿d")
- private Integer declareUserId;
-
- @ApiModelProperty("鍗曚綅")
- private String partUnit;
-
- @ApiModelProperty("浜т笟閾炬娴嬫暟鎹�")
- private String industryChain;
-
- @ApiModelProperty("鎶ユ鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime declareDate;
-
- @ApiModelProperty("鏄惁鍗″彲浠ュ搴︽楠� 0 鍚� 1 鏄�")
- private Integer isQuarter;
-
- // 淇敼鍚庣殑
- @ApiModelProperty("鎵瑰彿")
- private String updateBatchNo;
-
- @ApiModelProperty("鏄惁鏄摐鍗曚笣, 0鍚�, 1鏄�")
- private Integer isCopper;
-
- @ApiModelProperty("鐗╂枡绫诲瀷")
- private Integer isExpire;
-
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
deleted file mode 100644
index 237224e..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.ruoyi.basic.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class IfsInventoryQuantityDto extends IfsInventoryQuantityCheckDto {
-
- /**
- * 濮旀墭缂栧彿
- */
- @ApiModelProperty("濮旀墭缂栧彿")
- private String entrustCode;
-
- @ApiModelProperty("妫�楠屽璞�")
- private String sampleType;
-
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sampleName;
-
- @ApiModelProperty("鏍峰搧鍨嬪彿")
- private String sampleModel;
-
- @ApiModelProperty("鏍峰搧缂栧彿")
- private String sampleCode;
-
- // 杩涘巶
- @ApiModelProperty("璁㈠崟id")
- private Integer enterOrderId;
-
- @ApiModelProperty("鎶ュ憡id")
- private String enterReportId;
-
- @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
- private String enterUrl;
-
- @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
- private String enterUrlS;
-
- // 瀛ｅ害
- @ApiModelProperty("璁㈠崟id")
- private Integer quarterOrderId;
-
- @ApiModelProperty("鎶ュ憡id")
- private String quarterReportId;
-
- @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
- private String quarterUrl;
-
- @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
- private String quarterUrlS;
-
- private Integer orderState;
-
- @ApiModelProperty("涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
-
- @ApiModelProperty("鏉愭枡鍘傚")
- private String supplierName;
-
- @ApiModelProperty("濮旀墭浜�")
- private String prepareUser;
-
- @ApiModelProperty("棰滆壊")
- private String color;
-
- @ApiModelProperty("鏍囩鐘舵��")
- private String labelStatus;
-
- @ApiModelProperty("鏍囩鏉″舰鐮�")
- private String labelBarCode;
-
- @ApiModelProperty("鍒涘缓浜�")
- private Integer createUser;
-
- @ApiModelProperty("妫�楠屼汉")
- private String userName;
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
deleted file mode 100644
index 71bfddb..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.ruoyi.basic.dto;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.basic.pojo.IfsInventoryQuantity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 鑳芥煡璇㈠埌渚涘簲鍟�
- */
-@Data
-@ExcelIgnoreUnannotated
-public class IfsInventoryQuantitySupplierDto extends IfsInventoryQuantity {
-
- /**
- * 濮旀墭缂栧彿
- */
- @ExcelProperty(index = 2, value = "濮旀墭缂栧彿")
- @ApiModelProperty("濮旀墭缂栧彿")
- private String entrustCode;
-
- @ApiModelProperty("鏍峰搧id")
- private Integer sampleId;
-
- @ApiModelProperty("妫�楠屽璞�")
- private String sampleType;
-
- @ExcelProperty(index = 7, value = "鏍峰搧鍚嶇О")
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sampleName;
-
- @ExcelProperty(index = 8, value = "鏍峰搧鍨嬪彿")
- @ApiModelProperty("鏍峰搧鍨嬪彿")
- private String sampleModel;
-
- @ApiModelProperty("鏍峰搧缂栧彿")
- private String sampleCode;
-
- // 杩涘巶
- @ApiModelProperty("杩涘巶璁㈠崟id")
- private Integer enterOrderId;
-
- @ApiModelProperty("鎶ュ憡id")
- private String enterReportId;
-
- @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
- private String enterUrl;
-
- @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
- private String enterUrlS;
-
- // 瀛ｅ害
- @ApiModelProperty("瀛ｅ害璁㈠崟id")
- private Integer quarterOrderId;
-
- @ApiModelProperty("鎶ュ憡id")
- private String quarterReportId;
-
- @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
- private String quarterUrl;
-
- @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
- private String quarterUrlS;
-
- private Integer orderState;
-
- @ApiModelProperty("涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
-
- @ApiModelProperty("濮旀墭浜�")
- private String prepareUser;
-
- @ApiModelProperty("棰滆壊")
- private String color;
-
- @ApiModelProperty("鏍囩鐘舵��")
- private String labelStatus;
-
- @ApiModelProperty("鏍囩鏉″舰鐮�")
- private String labelBarCode;
-
- @ApiModelProperty("鍒涘缓浜�")
- private Integer createUser;
-
- @ExcelProperty(index = 9, value = "妫�楠屼汉")
- @ApiModelProperty("妫�楠屼汉")
- private String userName;
-
- @ExcelProperty(index = 10, value = "涓嬪彂鏃堕棿")
- private String sendTimeString;
-
- @ExcelProperty(index = 14, value = "鎺ユ敹鏃堕棿")
- private String receiverDateString;
-
- @ExcelProperty(index = 15, value = "鎶ユ鏃堕棿")
- private String declareDateString;
-
- // 鍚堟牸鐘舵��,: 0 妫�楠屼腑, 1鍚堟牸, 2涓嶅悎鏍�, 3鏈笅鍗�,4璁╂鏀捐
- @ExcelProperty(index = 6, value = "妫�楠岀姸鎬�")
- private String inspectStatusString;
-
- @ApiModelProperty("鎶ユ寮�濮嬫椂闂�")
- private String beginDeclareDate;
-
- @ApiModelProperty("鎶ユ缁撴潫鏃堕棿")
- private String endDeclareDate;
-
- @ApiModelProperty("涓嶅悎鏍兼弿杩�")
- @ExcelProperty(index = 16, value = "涓嶅悎鏍兼弿杩�")
- private String unqualifiedDesc;
-
-
- @ApiModelProperty("涓嶅悎鏍奸」")
- @ExcelProperty(index = 17, value = "涓嶅悎鏍奸」")
- private String unqualifiedItem;
-
- @ApiModelProperty("鍏嶆")
- private Integer isExemption;
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java
deleted file mode 100644
index 1963bb9..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/IfsInventoryQuantityMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.basic.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
-import com.ruoyi.basic.pojo.IfsInventoryQuantity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Mapper
-public interface IfsInventoryQuantityMapper extends BaseMapper<IfsInventoryQuantity> {
-
- /**
- * 鎵撳嵃鏍囩鏌ヨ
- * @param ids
- * @return
- */
- List<IfsInventoryQuantityDto> printLabel(@Param("ids") List<Integer> ids);
-
- /**
- *
- * @param ifsInventoryId
- * @return
- */
- int selectReportCountById(@Param("ifsInventoryId") Integer ifsInventoryId);
-
-
- /**
- * 鏌ヨ褰撳墠瀛ｅ害鏄惁鍑虹幇杩囪鏉愭枡
- * @param partDetail 鍨嬪彿
- * @param supplierName 渚涘簲鍟嗗悕绉�
- * @param startOfNextQuarter 瀛ｅ害寮�濮嬫椂闂�
- * @param endOfQuarter 瀛ｅ害缁撴潫鏃堕棿
- * @return
- */
- Integer selectIsFirst(@Param("partDetail") String partDetail,
- @Param("supplierName") String supplierName,
- @Param("startOfNextQuarter") LocalDateTime startOfNextQuarter,
- @Param("endOfQuarter") LocalDateTime endOfQuarter);
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index 4deb5df..9e4bf5a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
-import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardMethodList;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardTree;
@@ -51,42 +50,7 @@
List<FactoryDto> selectStandardTreeListByPartNo(@Param("partNo") String partNo);
- IPage<IfsInventoryQuantity> selectIfsPage(IPage<IfsInventoryQuantity> page,
- @Param("ew") QueryWrapper<IfsInventoryQuantity> ew);
-
- IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page,
- @Param("ew") QueryWrapper<IfsInventoryQuantityDto> ew);
-
-
- IPage<IfsInventoryQuantityCheckDto> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, @Param("ew")QueryWrapper<IfsInventoryQuantityCheckDto> ew);
-
- /**
- * 鍘熸潗鎶ユ鏌ヨ鍏ㄩ儴(鍒嗛〉)
- * @param page
- * @param ew
- * @return
- */
- IPage<IfsInventoryQuantitySupplierDto> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, @Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
-
- /**
- * 鍘熸潗鎶ユ鏌ヨ鍏ㄩ儴(鏃犲垎椤�)
- * @param ew
- * @return
- */
- List<IfsInventoryQuantitySupplierDto> getIfsByOverList(@Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
-
- /**
- * 鍘熸潗鏂欐煡璇㈠搴︽楠�
- * @param page
- * @param
- * @param beginDeclareDate
- * @param endDeclareDate
- * @return
- */
- IPage<IfsInventoryQuantitySupplierDto> getIfsByQuarter(Page<IfsInventoryQuantitySupplierDto> page, @Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);
-
}
-
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
deleted file mode 100644
index 3984802..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.ruoyi.basic.pojo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("ifs_inventory_quantity")
-@ExcelIgnoreUnannotated
-public class IfsInventoryQuantity implements Serializable {
- @TableId(type = IdType.AUTO)
- private Integer id;
-
-
- @ApiModelProperty("鍩�")
- private String contract;
-
- @ExcelProperty(index = 13, value = "璁㈠崟鍙�")
- @ApiModelProperty("璁㈠崟鍙�")
- private String orderNo;
-
- @ApiModelProperty("琛屽彿")
- private String lineNo;
-
- @ApiModelProperty("涓嬭揪鍙�")
- private String releaseNo;
-
- @ApiModelProperty("鎺ユ敹鍙�")
- private Integer receiptNo;
-
- @ExcelProperty(index = 3, value = "闆朵欢鍙�")
- @ApiModelProperty("闆朵欢鍙�")
- private String partNo;
-
- @ExcelProperty(index = 4, value = "闆朵欢鎻忚堪")
- @ApiModelProperty("闆朵欢鎻忚堪")
- private String partDesc;
-
- @ApiModelProperty("鐘舵�佹弿杩�(IFS鍘熸湰鎷夊彇鐨勭姸鎬�)")
- private String status;
-
- @ApiModelProperty("鐘舵��(IFS鍘熸湰鎷夊彇鐨勭姸鎬�)")
- private String statusDb;
-
- @ExcelProperty(index = 11, value = "鎶佃揪鐨勯噰璐暟閲�")
- @ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
- private BigDecimal qtyArrived;
-
- @ApiModelProperty("宸叉楠岀殑璐拱鏁伴噺")
- private BigDecimal qtyInspected;
-
- @ApiModelProperty("瑕佹楠岀殑閲囪喘鏁伴噺")
- private BigDecimal qtyToInspect;
-
- @ApiModelProperty("渚涘簲鍟嗙紪鍙�")
- private String supplierId;
-
- @ExcelProperty(index = 5, value = "渚涘簲鍟嗗悕绉�")
- @ApiModelProperty("渚涘簲鍟嗗悕绉�")
- private String supplierName;
-
- @ApiModelProperty("鎶佃揪鐨勫簱瀛樻暟閲�")
- private BigDecimal invQtyInStore;
-
- @ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
- private BigDecimal purQtyInStore;
-
- @ApiModelProperty("閰嶇疆鏍囪瘑")
- private String configurationId;
-
- @ApiModelProperty("鎵瑰彿")
- private String lotBatchNo;
-
- @ApiModelProperty("wdr鍙�")
- private String waivDevRejNo;
-
- @ApiModelProperty("娲诲姩搴忓垪")
- private Integer activitySeq;
-
- @ApiModelProperty("搴忓垪鍙�")
- private String serialNo;
-
- @ApiModelProperty("搴撲綅鍙�")
- private String locationNo;
-
- @ApiModelProperty("鐗堟湰鍙�")
- private String engChgLevel;
-
- @ApiModelProperty("鎺ユ敹浜�")
- private String receiver;
-
- @ApiModelProperty("鎺ユ敹浜哄鍚�")
- private String receiverName;
-
- @ApiModelProperty("閲囪喘鍛�")
- private String buyerCode;
-
- @ApiModelProperty("閲囪喘鍛樺鍚�")
- private String buyerName;
-
- @ApiModelProperty("瀹為檯鍒拌揣鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime arriveDate;
-
- @ApiModelProperty("瀹為檯浜よ揣鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime deliveryDate;
-
- @ApiModelProperty("鐢熶骇鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime productDate;
-
- @ApiModelProperty("澶辨晥鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime invalidDate;
-
-
- @ApiModelProperty("瀹℃壒鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime approvedDate;
-
- @ApiModelProperty("閲囪喘鐢宠鍒涘缓浜�")
- private String reqCeater;
-
- @ApiModelProperty("閲囪喘鐢宠鍒涘缓浜哄鍚�")
- private String reqCeaterName;
-
- @ApiModelProperty("閲囪喘璁㈠崟琛屽娉�")
- private String lineRemarks;
-
- @ExcelProperty(index = 12, value = "鍗曚綅")
- @ApiModelProperty("鍗曚綅")
- private String buyUnitMeas;
-
- @ApiModelProperty("鏄惁涓篿fs鎷夊彇,0 鍚�, 1鏄�")
- private Integer isSource;
-
- private Integer number;
-
-
- @ApiModelProperty("鐘舵��: 0:寰呮姤妫�, 1:寰呮楠�, :宸插鏍�")
- private Integer state;
-
- @ApiModelProperty("鎺ユ敹鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime receiverDate;
-
- @ApiModelProperty("鏄惁涓洪娆″嚭鐜� 0 鍚� 1 鏄�")
- private Integer isFirst;
-
- @ApiModelProperty("鐩爣搴撲綅鍙�")
- private String toLocation;
-
- @ApiModelProperty("鏄惁鏄姤妫� 0 鍚� 1 鏄�")
- private Integer isInspect;
-
- @ApiModelProperty("鎶ユ浜�")
- private String declareUser;
-
-
- @ApiModelProperty("鎶ユ浜篿d")
- private Integer declareUserId;
-
- @ApiModelProperty("鍗曚綅")
- private String partUnit;
-
- @ApiModelProperty("浜т笟閾炬娴嬫暟鎹�")
- private String industryChain;
-
- @ApiModelProperty("鎶ユ鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime declareDate;
-
- @ApiModelProperty("鏄惁鍗″彲浠ュ搴︽楠� 0 鍚� 1 鏄�")
- private Integer isQuarter;
-
- // 淇敼鍚庣殑
- @ExcelProperty(index = 1, value = "鎵瑰彿")
- @ApiModelProperty("鎵瑰彿")
- private String updateBatchNo;
-
- @ApiModelProperty("鏄惁缁撴潫, 0鍚�, 1鏄�")
- private Integer isFinish;
-
- @ApiModelProperty("鏄惁鏄摐鍗曚笣, 0鍚�, 1鏄�")
- private Integer isCopper;
-
- // 鍚堟牸鐘舵��,: 0 妫�楠屼腑, 1鍚堟牸, 2涓嶅悎鏍�, 3鏈笅鍗�,4璁╂鏀捐
- @ApiModelProperty("妫�楠岀姸鎬�")
- private Integer inspectStatus;
-
- @ApiModelProperty("鏄惁閲囪喘璁㈠崟鐧昏: 0鍚�, 1:鏄�")
- private Integer isRegister;
-
- @ApiModelProperty("鏄惁淇敼杩囨壒鍙�: 0鍚�, 1:鏄�")
- private Integer isUpdateBatch;
-
- // 鏄惁鏄繃鏈熸潗鏂�: 0鍚�, 1:鏄�"
- @ApiModelProperty("鐗╂枡绫诲瀷")
- private Integer isExpire;
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index c5695ec..ea94918 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -12,7 +12,6 @@
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
@@ -46,8 +45,6 @@
private StandardTreeMapper standardTreeMapper;
private StandardProductListService2 standardProductListService2;
-
- private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
@@ -166,31 +163,7 @@
})
.collect(Collectors.toList());
- // 鏌ヨ鍘傚鏄惁鏈夌壒娈婅姹傚��
- if (insSample.getIfsInventoryId() != null) {
- // 鏌ヨ鍘熸潗鏂欏巶瀹跺悕绉�
- String supplierName = ifsInventoryQuantityMapper.selectById(insSample.getIfsInventoryId())
- .getSupplierName();
- List<Long> collect = list.stream().map(StandardProductList::getId).collect(Collectors.toList());
- if (CollectionUtils.isNotEmpty(collect)) {
- List<StandardProductListSupplierAsk> supplierAsks = standardProductListSupplierAskMapper.selectList(Wrappers.<StandardProductListSupplierAsk>lambdaQuery()
- .in(StandardProductListSupplierAsk::getProductListId, collect)
- .eq(StandardProductListSupplierAsk::getSupplierName, supplierName));
- // 鍒ゆ柇鏈夋病鏈夌壒娈婂�肩粦瀹�
- if (CollectionUtils.isNotEmpty(supplierAsks)) {
- for (StandardProductList standardProductList : list) {
- for (StandardProductListSupplierAsk supplierAsk : supplierAsks) {
- if (standardProductList.getId().equals(supplierAsk.getProductListId())) {
- // 閲嶆柊璧嬪�艰姹傚�煎拰瑕佹眰鎻忚堪
- standardProductList.setAsk(supplierAsk.getAsk());
- standardProductList.setTell(supplierAsk.getTell());
- }
- }
- }
- }
- }
- }
return list;
}
diff --git a/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml b/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml
deleted file mode 100644
index 2b615be..0000000
--- a/basic-server/src/main/resources/mapper/IfsInventoryQuantityMapper.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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.ruoyi.basic.mapper.IfsInventoryQuantityMapper">
-
- <select id="printLabel" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityDto">
- SELECT io.sample sample_name,
- iiq.supplier_name,
- io.part_detail part_desc,
- io.send_time,
- io.prepare_user,
- io.entrust_code,
- iiq.qty_arrived,
- iiq.buy_unit_meas,
- CASE
- WHEN pp.color IS NOT NULL
- THEN pp.color
- ELSE sto.color
- END color,
- case
- when iiq.state = 2 then '2'
- when iiq.state = 1 then case
- when ROUND((select count(*)
- from ins_product ip
- where state = 1
- and ins_result is not null
- and ip.ins_sample_id in (select id
- from ins_sample
- where ins_sample.ins_order_id = io.id)) /
- (select count(*)
- from ins_product ip2
- where state = 1
- and ip2.ins_sample_id in
- (select id from ins_sample where ins_sample.ins_order_id = io.id)) *
- 100, 2) != 100 then '0'
- else '1' end
- end labelStatus,
- JSON_OBJECT(
- 'sample_ame', io.sample,
- 'supplier_name', iiq.supplier_name,
- 'part_desc', iiq.part_desc,
- 'entrust_code', io.entrust_code
- ) labelBarCode
- FROM ifs_inventory_quantity iiq
- LEFT JOIN ins_order io on io.id = (SELECT io2.id
- FROM ins_order io2
- WHERE io2.ifs_inventory_id = iiq.id
- and io2.state != -1
- order by io2.send_time desc
- limit 1) COLLATE utf8mb4_general_ci
- LEFT JOIN product_part pp ON pp.part_no = iiq.part_no COLLATE utf8mb4_general_ci
- LEFT JOIN structure_test_object_part sto ON sto.part_no = iiq.part_no COLLATE utf8mb4_general_ci
- WHERE iiq.id in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </select>
- <select id="selectReportCountById" resultType="java.lang.Integer">
- select count(*)
- from ifs_inventory_quantity iiq
- left join ins_order io on io.ifs_inventory_id = iiq.id and io.state
- left join ins_report ir on ir.ins_order_id = io.id
- where iiq.id = #{ifsInventoryId}
- and ir.id is not null
- </select>
- <select id="selectIsFirst" resultType="java.lang.Integer">
- select count(*)
- from ifs_inventory_quantity iiq
- LEFT JOIN ins_order io1 on io1.ifs_inventory_id = iiq.id
- and io1.state != -1
- where io1.part_detail = #{partDetail}
- and iiq.supplier_name = #{supplierName}
- and iiq.receiver_date between #{startOfNextQuarter} and #{endOfQuarter}
- </select>
-</mapper>
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 74ded82..3187d09 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -285,100 +285,4 @@
where sto.part_no = #{partNo}))
order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
</select>
-
- <sql id="getIfsOrder">
- select *
- from (SELECT ifs.*,
- COALESCE(io1.create_user, io2.create_user) create_user,
- COALESCE(io1.entrust_code, io2.entrust_code) entrust_code,
- COALESCE(io1.send_time, io2.send_time) send_time,
- io1.id enter_order_id,
- ir1.id enter_report_id,
- ir1.url enter_url,
- ir1.url_s enter_url_s,
- io2.id quarter_order_id,
- ir2.id quarter_report_id,
- ir2.url quarter_url,
- ir2.url_s quarter_url_s,
- group_concat(distinct isa.sample_code, ' ') sample_code,
- group_concat(distinct isa.sample, ' ') sample_name,
- group_concat(distinct isa.model, ' ') sample_model,
- COALESCE(io1.state, io2.state) order_state,
- COALESCE(isu.userName, COALESCE(u1.name, u2.name)) user_name,
- group_concat(distinct iuh.unqualified_desc, ' ') unqualified_desc,
- io1.is_exemption
- FROM ifs_inventory_quantity ifs
- LEFT JOIN ins_order io1 ON io1.ifs_inventory_id = ifs.id and io1.order_type = '杩涘巶妫�楠�' and io1.state != -1
- left join ins_report ir1 on io1.id = ir1.ins_order_id
- left join user u1 on io1.create_user = u1.id
- LEFT JOIN ins_order io2 ON io2.ifs_inventory_id = ifs.id and io2.order_type = 'Quarterly inspection' and io2.state != -1
- left join ins_report ir2 on io2.id = ir2.ins_order_id
- left join user u2 on io2.create_user = u2.id
- LEFT JOIN ins_sample isa ON COALESCE(io1.id, io2.id) = isa.ins_order_id
- LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName
- FROM ins_sample_user u
- LEFT JOIN user uu ON u.user_id = uu.id
- WHERE u.state = 0
- GROUP BY ins_sample_id
- ORDER BY ins_sample_id) isu ON isu.ins_sample_id = COALESCE(io1.id, io2.id)
- left join ins_unqualified_handler iuh on iuh.inventory_quantity_id = ifs.id
- group by ifs.id) a
- </sql>
-
- <select id="getIfsByStateOne" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityDto">
- <include refid="getIfsOrder"/>
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-
- <select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
- SELECT * from ifs_inventory_quantity ifs
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
- SELECT * from ifs_inventory_quantity ifs
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getIfsByOver" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
- select * from (<include refid="getIfsOrder"/>
- <where>
- <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
- send_time between #{beginDeclareDate} and #{endDeclareDate}
- </if>
- </where>
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getIfsByOverList" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
- select * from (<include refid="getIfsOrder"/>
- <where>
- <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
- send_time between #{beginDeclareDate} and #{endDeclareDate}
- </if>
- </where>
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getIfsByQuarter" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
- select * from (<include refid="getIfsOrder"/>
- <where>
- and (quarter_order_id is not null)
- <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
- and send_time between #{beginDeclareDate} and #{endDeclareDate}
- </if>
- </where>
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
</mapper>
--
Gitblit v1.9.3