2

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionStoreFeign.java <br/>

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionStoreFeignFallback.java <br/>

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionTobaccoFeign.java <br/>

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionTobaccoFeignFallback.java <br/>

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java

@@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionTobaccoDetailsFeign.java <br/>

yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionTobaccoDetailsFeignFallback.java <br/>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml

@@ -2,16 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountMapper">
     <select id="spdhmxb" resultType="java.util.Map">
-        SELECT  sbi.name ,prp.`proCode`,prp.`proName`,prp.`number`, SUM(CONVERT(packageTotalPrice,DECIMAL(12,2))) as ptotalPrice,
+        SELECT NAME,proCode,proName, number ,   packageTotalPrice   ptotalPrice, prodNum , prodValue ,
-        (SELECT  IFNULL(SUM(prodNum),0) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  ) prodNum,
+               number-prodNum  ztnumber,
-        (SELECT  CONVERT(IFNULL(SUM(prodValue),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  ) prodValue,
+               IF((  packageTotalPrice  -  prodValue  )>0,  packageTotalPrice  -  prodValue  ,0) ztprodValue1,
-        IF(prp.`number`-(SELECT  IFNULL(SUM(prodNum),0) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  ) > 0 , prp.`number`-(SELECT  IFNULL(SUM(prodNum),0) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  ) , 0) ztnumber,
+               IF((  prodValue -  packageTotalPrice  )>0,  prodValue  - packageTotalPrice  ,0) ztprodValue2
-        CONVERT(IF(SUM(packageTotalPrice)-(SELECT  IFNULL(SUM(prodValue),0) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  ) > 0 ,SUM(packageTotalPrice)-(SELECT IFNULL(SUM(prodValue),0) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  ), 0),DECIMAL(12,2)) ztprodValue1,
+        FROM(
-        CONVERT(IF((SELECT  IFNULL(SUM(prodValue),0) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  )-SUM(packageTotalPrice) > 0 ,(SELECT  SUM(prodValue) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode  )-SUM(packageTotalPrice), 0),DECIMAL(12,2)) ztprodValue2
+                SELECT  sbi.name ,prp.`proCode`,prp.`proName`,prp.`number`, SUM(CONVERT(packageTotalPrice,DECIMAL(12,2))) packageTotalPrice,
-        FROM `supplier_bank_info` sbi
+                        (SELECT  CONVERT(IFNULL(SUM(prodNum),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode AND gic.`prodCode` IN(SELECT prodcode FROM `gd_rescategory_prod`) ) prodNum,
-        LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified
+                        (SELECT  CONVERT(IFNULL(SUM(prodValue),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode AND gic.`prodCode` IN(SELECT prodcode FROM `gd_rescategory_prod`)  ) prodValue
-        LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid
+                FROM `supplier_bank_info` sbi
-        WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1
+                         LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified
-        GROUP BY pr.supplierOnlyCode,prp.`proCode`  ORDER BY sbi.name,prp.`proCode`;
+                         LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid
+                WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1
+                GROUP BY pr.supplierOnlyCode,prp.`proCode`  ORDER BY sbi.name,prp.`proCode`) t
+
     </select>
 </mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java

@@ -35,12 +35,8 @@ import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo;
 import com.yxt.supervise.portal.api.inventoryinformation.*;
 import com.yxt.supervise.portal.api.productinformation.ProductInformation;
 import com.yxt.supervise.portal.api.productinformation.ProductInformationVo;
-import com.yxt.supervise.portal.api.productnum.ProductNum;
-import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro;
 import com.yxt.supervise.portal.biz.dictcommon.DictCommonService;
 import com.yxt.supervise.portal.biz.productinformation.ProductInformationService;
-import com.yxt.supervise.portal.biz.productnum.ProductNumService;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -50,8 +46,6 @@ import com.yxt.common.core.vo.PagerVo;
 
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationMapper.java

@@ -67,4 +67,6 @@ public interface ProductInformationMapper extends BaseMapper<ProductInformation>
 	@Select("SELECT * FROM `product_information`  WHERE  (brandSid IN(SELECT CODE FROM restricted_brand)  " +
 			"AND categoryKey IN(SELECT dictKey FROM restricted_category) AND CODE = #{code}) or (categoryKey in('081101','081102','081103'))")
 	ProductInformationVo limitJudgement(String code);
+	@Select("select * from product_information where sid=#{sid}")
+	ProductInformation fetchBySid(@Param("sid") String dtoSid);
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java

@@ -37,6 +37,7 @@ import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo;
 import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfo;
 import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfoVo;
 import com.yxt.supervise.portal.api.productinformation.*;
+import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfo;
 import com.yxt.supervise.portal.api.supplierinfo.SupplierInfo;
 import com.yxt.supervise.portal.api.supplierinfo.SupplierInfoVo;
 import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfo;
@@ -47,6 +48,7 @@ import com.yxt.supervise.portal.api.warehouseshelves.WarehouseShelvesVo;
 import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService;
 import com.yxt.supervise.portal.biz.dictcommon.DictCommonService;
 import com.yxt.supervise.portal.biz.manufacturerinfo.ManufacturerInfoService;
+import com.yxt.supervise.portal.biz.supplierbankinfo.SupplierBankInfoService;
 import com.yxt.supervise.portal.biz.supplierinfo.SupplierInfoService;
 import com.yxt.supervise.portal.biz.warehouseposition.WarehousePositionService;
 import com.yxt.supervise.portal.biz.warehouseshelves.WarehouseShelvesService;
@@ -100,6 +102,8 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
 	@Resource
 	private SupplierInfoService supplierInfoService;
 	@Resource
+	private SupplierBankInfoService supplierBankInfoService;
+	@Resource
 	private ProductInformationService productInformationService;
 	private QueryWrapper<ProductInformation> createQueryWrapper(ProductInformationQuery query) {
 		// todo: 这里根据具体业务调整查询条件
@@ -137,7 +141,7 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
         if (StringUtils.isBlank(dtoSid)) {
             return;
         } 
-		ProductInformation entity = fetchBySid(dtoSid);
+		ProductInformation entity = baseMapper.fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
@@ -407,11 +411,11 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
 								SupplierInfoVo supplierInfoVo=supplierInfoService.selectByCode(key);
 								if(supplierInfoVo==null){
 									supplierInfoVo=new SupplierInfoVo();
-									SupplierInfo m=new SupplierInfo();
+									SupplierBankInfo sbi=new SupplierBankInfo();// m=new SupplierInfo();
-									m.setName(v);
+									sbi.setName(v);
-									m.setCode(key);
+									sbi.setCodeUnified(key);
-									supplierInfoService.insert(m);
+									supplierBankInfoService.insert(sbi);
-									supplierInfoVo.setSid(m.getSid());
+									supplierInfoVo.setSid(sbi.getSid());
 								}
 								productInformation.setSupplier(v);
 								productInformation.setSupplierSid(supplierInfoVo.getSid());
@@ -544,16 +548,20 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
 				System.err.println("i="+i+",value=null");
 			}
 
-			aaa+=1;
+			//aaa+=1;
-			lisss.add(rowNum+"");
+			//lisss.add(rowNum+"");
-			log.info("productInformation:{}", JSONObject.toJSONString(productInformation));
+			//log.info("productInformation:{}", JSONObject.toJSONString(productInformation));
-			productInformationService.insert(productInformation);
+			String code = productInformation.getCode();
+			ProductInformationVo productInformationVo = productInformationService.selectByCode(code);
+			if(productInformationVo!=null){
+				productInformation.setSid(productInformationVo.getSid());
+				ProductInformationDto pd=new ProductInformationDto();
+				BeanUtil.copyProperties(productInformation,pd);
+				productInformationService.saveOrUpdateDto(pd);
+			}else {
+				productInformationService.insert(productInformation);
+			}
 		}
-		String x = JSON.toJSONString(lisss);
-		System.out.println(x);
-		String x1 = JSON.toJSONString(lisss2);
-		System.out.println(x1);
-		//return message;
 	}
 
 	public ProductInformationVo selectByCode(String code) {

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java

@@ -32,11 +32,13 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     @Select("select * from purchase_requisition  ")
     List<PurchaseRequisition> selectAll();
     @Select(" SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) name ,1,convert(SUM(packageTotalPrice),decimal(12,2)) billTotalPrice, " +
-            " (SELECT convert(SUM(prodValue),decimal(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode and gic.prodCode in(select prodcode from gd_rescategory_prod) ) prodValue, " +
+            "(SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE  gic.colex=pr.supplierOnlyCode " +
-            " MAX(pr.`arrivalDate`) arrivalDate FROM `supplier_bank_info` sbi  " +
+            "and gic.colh7 in(select prodcode from gd_rescategory_prod) ) prodValue," +
-            "LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " +
+            "MAX(pr.`arrivalDate`) arrivalDate " +
+            "FROM `supplier_bank_info` sbi  " +
+            "LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified" +
             "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " +
-            " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1  " +
+            " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " +
             " GROUP BY pr.supplierOnlyCode  ORDER BY sbi.name;")
     List<Map<String, Object>> ztspglhzb();
     @Select("SELECT MAX(sbi.name) name,code,SUM(packageTotalPrice) billTotalPrice,MAX(purchaseDate) billDate,MAX(arrivalDate) arrivalDate FROM `purchase_requisition` pr " +
@@ -64,4 +66,22 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     void deleteAll();
     @Select("select * from hz_ztspglhzb where codeUnified =#{codeUnified} AND wdhjz!=0 ")
     List<Map<String, String>> suplierZtyz( @Param("codeUnified") String supplierCode);
+
+
+    //该方法是放弃了监管商品的索引表来判断 商品是否有在途的情况
+    @Select(" SELECT codeUnified,NAME,1,billTotalPrice,prodValue,billTotalPrice-prodValue bp FROM(" +
+            " SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) NAME ,1," +
+            " CONVERT(SUM(packageTotalPrice),DECIMAL(12,2)) billTotalPrice, " +
+            " (  SELECT CONVERT(SUM(colq16),DECIMAL(12,2)) FROM gd_instorage gic " +
+            " LEFT JOIN `product_information` PI ON pi.code=gic.colh7 " +
+            " WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND pi.categoryKey IN(SELECT categoryKey FROM `restricted_category`) " +
+            " AND pi.brandsid IN(SELECT CODE FROM `restricted_brand`) ) prodValue, " +
+            " MAX(pr.`arrivalDate`) arrivalDate " +
+            " FROM `supplier_bank_info` sbi  " +
+            " LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " +
+            " LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " +
+            " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " +
+            " GROUP BY pr.supplierOnlyCode  ORDER BY sbi.name) t " +
+            " where codeUnified=#{codeUnified} and(billTotalPrice-prodValue)>0 ;")
+    List<Map<String, String>> suplierZtyz2( @Param("codeUnified") String supplierCode);
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java

@@ -420,7 +420,8 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
         if(supplierInfoVo==null){
             return objectResultBean.setMsg("供应商不存在!");
         }
-        List<Map<String,String>> suplierZtyz=baseMapper.suplierZtyz(pr.getSupplierCode());
+       // List<Map<String,String>> suplierZtyz=baseMapper.suplierZtyz(pr.getSupplierCode()); 临时注释掉 2023-01-16
+        List<Map<String,String>> suplierZtyz=baseMapper.suplierZtyz2(pr.getSupplierCode());
         if(suplierZtyz.size()>0){
             return objectResultBean.setMsg("供应商有在途商品!");
         }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java

@@ -36,11 +36,8 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
  * File: PurchaseRequisitionStoreService.java <br/>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java

@@ -28,7 +28,6 @@ package com.yxt.supervise.portal.biz.purchaserequisitiontobacco;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore;
 import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco;
-import com.yxt.supervise.portal.api.salesdata.SalesData;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java

@@ -32,7 +32,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java

@@ -31,21 +31,17 @@ import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.text.csv.CsvReader;
 import cn.hutool.core.text.csv.CsvUtil;
 import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore;
-import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco;
 import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails;
 import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsQuery;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
-import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreService;
 import lombok.extern.slf4j.Slf4j;