2

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

@@ -613,5 +613,4 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
             cell.setCellStyle(style);
         }
     }
-
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java

@@ -44,4 +44,15 @@ public interface PurchaseRequisitionProMapper extends BaseMapper<PurchaseRequisi
     int delByMainSids(@Param("list") String[] split);
     @Select("select * from gd_rescategory_prod where prodCode=#{proCode}")
     List<PurchaseRequisitionPro> selectValByCode(String proCode);
+    @Select("SELECT prp.procode  \n" +
+        "FROM `purchase_requisition_pro` prp \n" +
+        "LEFT JOIN `purchase_requisition` pr ON prp.mainsid=pr.sid \n" +
+        "WHERE pr.purchaseState=1 AND bankstate=1 AND prp.categoryKey IN(SELECT categoryKey FROM  `restricted_category`)\n" +
+        "AND prp.brandCode IN(SELECT CODE FROM `restricted_brand` )\n" +
+        "AND pr.supplierOnlyCode IN (SELECT codeUnified FROM `supplier_bank_info` WHERE purchaseRequisition=1 AND bankState=1)\n" +
+        "GROUP BY prp.procode")
+    List<String> selectProdCodeIndex();
+    @Select("delete from gd_rescategory_prod ")
+    void deleteProdIndex();
+    int batchInsertProdCodeIndex(List<String> list);
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.xml

@@ -40,5 +40,10 @@
             #{item}
         </foreach>
     </delete>
-
+    <insert id="batchInsertProdCodeIndex" parameterType="List">
+        insert into gd_rescategory_prod(prodCode) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
 </mapper>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProRest.java

@@ -1,11 +1,28 @@
 package com.yxt.supervise.portal.biz.purchaserequisitionpro;
 
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.text.ParseException;
+
 @Api(tags = "采购订单商品信息")
 @RestController("com.supervise.biz.purchaserequisitionpro.PurchaseRequisitionProRest")
 @RequestMapping("v1/purchaserequisitionpro")
 public class PurchaseRequisitionProRest {
+    @Resource
+    private PurchaseRequisitionProService purchaseRequisitionProService;
+    @ApiOperation("更新商品代码的索引表")
+    @RequestMapping(value = "/makeProdCodeIndex", method = RequestMethod.POST)
+    public ResultBean makeProdCodeIndex(){
+        ResultBean rb = ResultBean.fireFail();
+        int i=    purchaseRequisitionProService.makeProdCodeIndex();
+        GdRescategoryProdService.resetCache();
+        return  rb.success().setData(i);
+    }
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java

@@ -69,4 +69,11 @@ public class PurchaseRequisitionProService extends MybatisBaseService<PurchaseRe
     public List<PurchaseRequisitionPro> selectValByCode(String proCode) {
        return  baseMapper.selectValByCode(proCode);
     }
+
+    public int makeProdCodeIndex() {
+        List<String> l=baseMapper.selectProdCodeIndex();
+        baseMapper.deleteProdIndex();
+        int r=baseMapper.batchInsertProdCodeIndex(l);
+        return r;
+    }
 }

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

@@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: yxt-supervise(宇信通监管) <br/>
@@ -58,6 +59,19 @@ public interface PurchaseRequisitionTobaccoMapper extends BaseMapper<PurchaseReq
 
     @Select("select * from purchase_requisition_tobacco where code like CONCAT('%',#{date},'%') ")
     List<PurchaseRequisitionTobacco> selectByDateForCode(@Param("date")String date);
+    @Select("SELECT '市烟草' supplierName,prtd.prodName prodName,SUM(prtd.ddl) ddl,prtd.price price\n" +
+            "FROM `purchase_requisition_tobacco_details` prtd \n" +
+            "LEFT JOIN `purchase_requisition_store` prs ON prtd.`mainSid`=prs.`sid` \n" +
+            "LEFT JOIN `purchase_requisition_tobacco` prt ON prs.`mainSid`=prt.`sid`\n" +
+            "WHERE prt.`purchaseDate`=#{date} " +
+            "GROUP BY prtd.prodName")
+    List<Map<String, String>> selectDdinfo(@Param("date")String date);
+    @Select("SELECT  SUM(prtd.price) price\n" +
+            "FROM `purchase_requisition_tobacco_details` prtd\n" +
+            "LEFT JOIN `purchase_requisition_store` prs ON prtd.`mainSid`=prs.`sid` \n" +
+            "LEFT JOIN `purchase_requisition_tobacco` prt ON prs.`mainSid`=prt.`sid`\n" +
+            "WHERE prt.`purchaseDate`=#{date} ")
+    Map<String, String> selectDdzje(@Param("date")String date);
 
     //@Update("update purchase_requisition_tobacco set name=#{msg} where id=#{id}")
     //IPage<PurchaseRequisitionTobaccoVo> voPage(IPage<PurchaseRequisitionTobacco> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseRequisitionTobacco> qw);

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

@@ -32,6 +32,7 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +52,7 @@ import java.util.List;
  * @version 1.0
  * @since 1.0
  */
+@Slf4j
 @Api(tags = "采购订单表")
 @RestController("com.yxt.supervise.portal.biz.purchaserequisitiontobacco.PurchaseRequisitionTobaccoRest")
 @RequestMapping("/purchaserequisitiontobacco")
@@ -67,6 +69,19 @@ public class PurchaseRequisitionTobaccoRest {
         return rb.success().setData(pv);
     }
 
+    /**
+     * 在途商品统计条件：207家报烟店范围、审核通过的烟草采购订单（230105开始）中商品明细有未入库的记录。
+     * @return
+     */
+    @ApiOperation("烟草在途")
+    @RequestMapping(value = "/yczt", method = RequestMethod.POST)
+    public ResultBean yczt(@RequestParam("date") String date){
+        log.info("yczt:{}","/yczt");
+        ResultBean rb = ResultBean.fireFail();
+        purchaseRequisitionTobaccoService.yczt(date);
+        return  rb.success();
+    }
+
     @ApiOperation("所有数据列表")
     @GetMapping("/list")
     public ResultBean<List<PurchaseRequisitionTobacco>> list() {

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

@@ -187,6 +187,14 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService<Purcha
 		}
         return qw;
     }
+
+	public void yczt(String date) {
+		//  在途商品统计条件：207家报烟店范围、审核通过的烟草采购订单（230105开始）中商品明细有未入库的记录。
+		List<Map<String,String>> list=baseMapper.selectDdinfo(date);
+		Map<String,String> zje=baseMapper.selectDdzje(date);
+		log.info("list:{}",JSONObject.toJSONString(list));
+		log.info("zje:{}",JSONObject.toJSONString(zje));
+	}
 	public void readBrandPeriodSorXls1(MultipartFile file)  {
 
 		ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobacco");

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java

@@ -255,42 +255,7 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
 						brandInfo.setCode(sd.getBrandCode());
 						brandInfoService.insert(brandInfo);
 					}
-					String dalei=sd.getCategoryb();
-					String[] split_dalei = dalei.split("]");
-					String key_dalei = split_dalei[0].replace("[","");//key
-					String v_dalei=split_dalei[1];//类别value
-					DictCommonDetailsVo category_dalei = dictCommonService.fetchByKeyAndType(key_dalei, "category");
-					if(category_dalei==null){
-						DictCommon dc=new DictCommon();
-						dc.setDictType("category");
-						dc.setDictKey(key_dalei);
-						dc.setDictValue(v_dalei);
-						dictCommonService.insert(dc);
-					}
-					String zhonglei=sd.getCategorym();
-					String[] split_zhonglei = zhonglei.split("]");
-					String key_zhonglei = split_zhonglei[0].replace("[","");//key
-					String v_zhonglei=split_zhonglei[1];//类别value
-					DictCommonDetailsVo category_zhonglei = dictCommonService.fetchByKeyAndType(key_zhonglei, "category");
-					if(category_zhonglei==null){
-						DictCommon dc=new DictCommon();
-						dc.setDictType("category");
-						dc.setDictKey(key_zhonglei);
-						dc.setDictValue(v_zhonglei);
-						dictCommonService.insert(dc);
-					}
-					String xiaolei=sd.getCategorys();
-					String[] split_xiaolei = xiaolei.split("]");
-					String key_xiaolei = split_xiaolei[0].replace("[","");//key
-					String v_xiaolei=split_xiaolei[1];//类别value
-					DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(key_xiaolei, "category");
-					if(category==null){
-						DictCommon dc=new DictCommon();
-						dc.setDictType("category");
-						dc.setDictKey(key_xiaolei);
-						dc.setDictValue(v_xiaolei);
-						dictCommonService.insert(dc);
-					}
+					validDictcommon(sd);
 				}
 				baseMapper.updateStoreName(salesDatas.get(0).getDataDate());
 				baseMapper.deleteSalesDataByDate(salesDatas.get(0).getDataDate());
@@ -299,6 +264,46 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
 			}
 		};
 	}
+
+	private void validDictcommon(SalesData sd) {
+		String xiaolei= sd.getCategorys();
+		String[] split_xiaolei = xiaolei.split("]");
+		String key_xiaolei = split_xiaolei[0].replace("[","");//key
+		String v_xiaolei=split_xiaolei[1];//类别value
+		DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(key_xiaolei, "category");
+		if(category==null){
+			DictCommon dc=new DictCommon();
+			dc.setDictType("category");
+			dc.setDictKey(key_xiaolei);
+			dc.setDictValue(v_xiaolei);
+			dictCommonService.insert(dc);
+			String dalei= sd.getCategoryb();
+			String[] split_dalei = dalei.split("]");
+			String key_dalei = split_dalei[0].replace("[","");//key
+			String v_dalei=split_dalei[1];//类别value
+			DictCommonDetailsVo category_dalei = dictCommonService.fetchByKeyAndType(key_dalei, "category");
+			if(category_dalei==null){
+				DictCommon dc_dalei=new DictCommon();
+				dc_dalei.setDictType("category");
+				dc_dalei.setDictKey(key_dalei);
+				dc_dalei.setDictValue(v_dalei);
+				dictCommonService.insert(dc_dalei);
+				String zhonglei= sd.getCategorym();
+				String[] split_zhonglei = zhonglei.split("]");
+				String key_zhonglei = split_zhonglei[0].replace("[","");//key
+				String v_zhonglei=split_zhonglei[1];//类别value
+				DictCommonDetailsVo category_zhonglei = dictCommonService.fetchByKeyAndType(key_zhonglei, "category");
+				if(category_zhonglei==null){
+					DictCommon dc_zhonglei=new DictCommon();
+					dc_zhonglei.setDictType("category");
+					dc_zhonglei.setDictKey(key_zhonglei);
+					dc_zhonglei.setDictValue(v_zhonglei);
+					dictCommonService.insert(dc_zhonglei);
+				}
+			}
+		}
+	}
+
 	public void readBrandPeriodSorXls1(MultipartFile file,String sid)  {
 
         /*ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobaccoDetails");