diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java index 216def7b..90db705a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java @@ -56,8 +56,8 @@ public class PurchaseRequisitionStore extends BaseEntity { private String modifySid; // 更新者 @ApiModelProperty("关联表sid") private String mainSid; // 关联表sid - @ApiModelProperty("卷烟代码") - private String yczbh; // 卷烟代码 + @ApiModelProperty("烟草证编码") + private String yCode; // 烟草证编码 @ApiModelProperty("门店代码") private String storeCode; // 门店代码 @ApiModelProperty("门店名称") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java index 5dd502e6..e822b7e7 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java @@ -56,8 +56,8 @@ public class PurchaseRequisitionStoreDetailsVo implements Vo { @ApiModelProperty("更新者") private String modifySid; // 更新者 private String mainSid; // 关联表sid - @ApiModelProperty("卷烟代码") - private String yczbh; // 卷烟代码 + @ApiModelProperty("烟草证编码") + private String yCode; // 烟草证编码 @ApiModelProperty("门店代码") private String storeCode; // 门店代码 @ApiModelProperty("门店名称") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java index e3d9f281..0a2e5dcb 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java @@ -56,8 +56,8 @@ public class PurchaseRequisitionStoreDto implements Dto { @ApiModelProperty("更新者") private String modifySid; // 更新者 private String mainSid; // 关联表sid - @ApiModelProperty("卷烟代码") - private String yczbh; // 卷烟代码 + @ApiModelProperty("烟草证编码") + private String yCode; // 烟草证编码 @ApiModelProperty("门店代码") private String storeCode; // 门店代码 @ApiModelProperty("门店名称") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java index f8452ddf..dc0a055f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java @@ -54,8 +54,8 @@ public class PurchaseRequisitionStoreQuery implements Query { @ApiModelProperty("更新者") private String modifySid; // 更新者 private String mainSid; // 关联表sid - @ApiModelProperty("卷烟代码") - private String yczbh; // 卷烟代码 + @ApiModelProperty("烟草证编码") + private String yCode; // 烟草证编码 @ApiModelProperty("门店代码") private String storeCode; // 门店代码 @ApiModelProperty("门店名称") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java index de78561f..4769e079 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java @@ -56,8 +56,8 @@ public class PurchaseRequisitionStoreVo implements Vo { @ApiModelProperty("更新者") private String modifySid; // 更新者 private String mainSid; // 关联表sid - @ApiModelProperty("卷烟代码") - private String yczbh; // 卷烟代码 + @ApiModelProperty("烟草证编码") + private String yCode; // 烟草证编码 @ApiModelProperty("门店代码") private String storeCode; // 门店代码 @ApiModelProperty("门店名称") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java index 779f41d9..7245885e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java @@ -58,10 +58,10 @@ public class PurchaseRequisitionTobaccoDetails extends BaseEntity { private String mainSid; // 关联表sid @ApiModelProperty("卷烟代码") private String yCode; // 卷烟代码 - @ApiModelProperty("门店名称编码") - private String storeCode; // 门店名称编码 - @ApiModelProperty("门店名称") - private String storeName; // 门店名称 + @ApiModelProperty("商品编码") + private String prodCode; // 门店名称编码 + @ApiModelProperty("商品名称") + private String prodName; // 门店名称 @ApiModelProperty("批发价") private String pfj; // 批发价 @ApiModelProperty("要货量") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java index 7f42eb09..5817f2da 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java @@ -59,10 +59,10 @@ public class PurchaseRequisitionTobaccoDetailsDetailsVo implements Vo { private String mainSid; // 关联表sid @ApiModelProperty("卷烟代码") private String yCode; // 卷烟代码 - @ApiModelProperty("门店名称编码") - private String storeCode; // 门店名称编码 - @ApiModelProperty("门店名称") - private String storeName; // 门店名称 + @ApiModelProperty("商品编码") + private String prodCode; // 门店名称编码 + @ApiModelProperty("商品名称") + private String prodName; // 门店名称 @ApiModelProperty("批发价") private String pfj; // 批发价 @ApiModelProperty("要货量") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java index 57039fb0..4ca5b4a2 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java @@ -59,10 +59,10 @@ public class PurchaseRequisitionTobaccoDetailsDto implements Dto { private String mainSid; // 关联表sid @ApiModelProperty("卷烟代码") private String yCode; // 卷烟代码 - @ApiModelProperty("门店名称编码") - private String storeCode; // 门店名称编码 - @ApiModelProperty("门店名称") - private String storeName; // 门店名称 + @ApiModelProperty("商品编码") + private String prodCode; // 门店名称编码 + @ApiModelProperty("商品名称") + private String prodName; // 门店名称 @ApiModelProperty("批发价") private String pfj; // 批发价 @ApiModelProperty("要货量") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java index 38dde960..ac4e6adb 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java @@ -57,10 +57,10 @@ public class PurchaseRequisitionTobaccoDetailsQuery implements Query { private String mainSid; // 关联表sid @ApiModelProperty("卷烟代码") private String yCode; // 卷烟代码 - @ApiModelProperty("门店名称编码") - private String storeCode; // 门店名称编码 - @ApiModelProperty("门店名称") - private String storeName; // 门店名称 + @ApiModelProperty("商品编码") + private String prodCode; // 门店名称编码 + @ApiModelProperty("商品名称") + private String prodName; // 门店名称 @ApiModelProperty("批发价") private String pfj; // 批发价 @ApiModelProperty("要货量") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java index 38148f8c..ecd2f94c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java @@ -59,10 +59,10 @@ public class PurchaseRequisitionTobaccoDetailsVo implements Vo { private String mainSid; // 关联表sid @ApiModelProperty("卷烟代码") private String yCode; // 卷烟代码 - @ApiModelProperty("门店名称编码") - private String storeCode; // 门店名称编码 - @ApiModelProperty("门店名称") - private String storeName; // 门店名称 + @ApiModelProperty("商品编码") + private String prodCode; // 门店名称编码 + @ApiModelProperty("商品名称") + private String prodName; // 门店名称 @ApiModelProperty("批发价") private String pfj; // 批发价 @ApiModelProperty("要货量") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategory.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategory.java index 2ff53175..0c8956f7 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategory.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategory.java @@ -52,8 +52,8 @@ public class RestrictedCategory extends BaseEntity { @ApiModelProperty("监管品类") private String categorys; // 监管品类 - @ApiModelProperty("监管品牌") - private String brands; // value值 + @ApiModelProperty("监管品类Key") + private String categoryKey; // 监管品类Key } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDetailsVo.java index 08bc2bc9..986450ba 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDetailsVo.java @@ -52,7 +52,7 @@ public class RestrictedCategoryDetailsVo implements Vo { private String sid; // sid @ApiModelProperty("监管品类") private String categorys; // 监管品类 - @ApiModelProperty("监管品牌") - private String brands; // value值 + @ApiModelProperty("监管品类Key") + private String categoryKey; // 监管品类Key } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDto.java index 716971d4..296fa7d2 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDto.java @@ -52,7 +52,7 @@ public class RestrictedCategoryDto implements Dto { private String sid; // sid @ApiModelProperty("监管品类") private String categorys; // 监管品类 - @ApiModelProperty("监管品牌") - private String brands; // value值 + @ApiModelProperty("监管品类Key") + private String categoryKey; // 监管品类Key } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryQuery.java index 8974b890..233dac2f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryQuery.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryQuery.java @@ -51,7 +51,7 @@ public class RestrictedCategoryQuery implements Query { @ApiModelProperty("监管品类") private String categorys; // 监管品类 - @ApiModelProperty("监管品牌") - private String brands; // value值 + @ApiModelProperty("监管品类Key") + private String categoryKey; // 监管品类Key } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryVo.java index 497bae77..13b6d7cc 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryVo.java @@ -52,7 +52,7 @@ public class RestrictedCategoryVo implements Vo { private String sid; // sid @ApiModelProperty("监管品类") private String categorys; // 监管品类 - @ApiModelProperty("监管品牌") - private String brands; // value值 + @ApiModelProperty("监管品类Key") + private String categoryKey; // 监管品类Key } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java index d93da00c..ed58295e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java @@ -39,6 +39,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.util.Map; /** * Project: com.supervise(宇信通监管)
@@ -156,17 +157,19 @@ public class ProductNumRest implements ProductNumFeign { ex.printStackTrace(); } } - /*@ApiOperation(" ") + @ApiOperation(" ") @RequestMapping(value = "/products", method = RequestMethod.GET) public ResultBean products(HttpServletRequest request, HttpServletResponse response){ String pc=request.getParameter("code"); ResultBean rb = ResultBean.fireFail(); //excel标题 //excel文件名 String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls"; - HSSFWorkbook wb = productNumService.products( pc); + Map products = productNumService.products(pc); + HSSFWorkbook wb = (HSSFWorkbook) products.get("wb"); + String pd = products.get("pd").toString(); //响应到客户端 try { - this.setResponseHeader(response, fileName); + this.setResponseHeader(response, pd+fileName); OutputStream os = response.getOutputStream(); wb.write(os); os.flush(); @@ -175,5 +178,5 @@ public class ProductNumRest implements ProductNumFeign { e.printStackTrace(); } return rb; - }*/ + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java index d758aaa1..b212210e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java @@ -194,14 +194,12 @@ public class ProductNumService extends MybatisBaseService restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); - if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ + Map map=restrictedCategoryService.limitJudgement(categoryKey,brandSid); + if("081101,081102,081103".indexOf(categoryKey)>=0|| "1".equals(map.get("success"))){ pr.setState(1); }else{ pr.setState(0); - String remarks=""; - remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,"; - remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;"; + String remarks=map.get("msg"); pr.setRemarks(remarks); } pr.setCode(code); @@ -461,23 +459,25 @@ public class ProductNumService extends MybatisBaseService products(String pc){ + String title = "商品订货明细限定情况"; String[] col = {"审核单号","状态","合计金额"}; String[] col1 = {"序号","采购订单编号","厂商编码","厂商名称","商品代码","商品条码","商品名称","单位","进价","箱规", "订货数量","订货金额（元）","合计","税票","降价折扣%","判定结果","备注"}; //sheet名 - String sheetName = pc+"重点品类商品订货明细限定情况"; + String sheetName = pc+"商品订货明细限定情况"; //创建HSSFWorkbook PurchaseRequisition purchaseRequisition=purchaseRequisitionService.selectByCode(pc); String purchaseRequisitionSid = purchaseRequisition.getSid(); @@ -502,14 +502,14 @@ public class ProductNumService extends MybatisBaseService map=new HashMap<>(); + map.put("wb",wb); + map.put("pd",pd); + return map; + } + private void addProductNum(PurchaseRequisition pu,List list) { Map map=new HashMap(); map.put("pc",pu.getCode()); @@ -554,14 +558,12 @@ public class ProductNumService extends MybatisBaseService restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); - if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ + Map maps=restrictedCategoryService.limitJudgement(categoryKey,brandSid); + if("081101,081102,081103".indexOf(categoryKey)>=0||"1".equals(maps.get("success"))){ pr.setState(1); }else{ pr.setState(0); - String remarks=""; - remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,"; - remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;"; + String remarks=maps.get("msg"); pr.setRemarks(remarks); } pr.setCode(p.getProCode()); @@ -591,5 +593,5 @@ public class ProductNumService extends MybatisBaseService selectAll(); @Select(" SELECT sbi.codeUnified, sbi.name ,1,SUM(packageTotalPrice) billTotalPrice, " + - " (SELECT SUM(prodValue) FROM gd_instorage_count gic WHERE gic.supplierCodeUnified=pr.supplierOnlyCode ) prodValue, " + + " (SELECT SUM(prodValue) FROM gd_instorage_count gic WHERE gic.supplierCodeUnified=pr.supplierOnlyCode and gic.prodCode in(select prodcode from gd_rescategory_prod) ) 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 " + @@ -60,4 +60,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectByPc(@Param("pc")String pc); + @Delete(" DELETE FROM hz_ztspglhzb") + void deleteAll(); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java index bb6b2a10..a4f559fe 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java @@ -141,7 +141,7 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { ResultBean rb = ResultBean.fireFail(); //excel标题 //excel文件名 String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls"; - HSSFWorkbook wb = purchaseRequisitionService.products( pc); + HSSFWorkbook wb =null;// purchaseRequisitionService.products( pc); //响应到客户端 try { this.setResponseHeader(response, fileName); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java index 0247e6aa..86a7ee56 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java @@ -121,6 +121,7 @@ public class PurchaseRequisitionService extends MybatisBaseService> list=baseMapper.ztspglhzb();//--在途商品管理汇总表 for(Map m:list){ String billTotalPrice= m.get("billTotalPrice")!=null?m.get("billTotalPrice").toString():"0";//订单总额 @@ -299,20 +300,7 @@ public class PurchaseRequisitionService extends MybatisBaseService restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); - // if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ - // pr.setState(1); - // }else{ - // pr.setState(2); - /* RestrictedCategory restrictedCategory=new RestrictedCategory(); - restrictedCategory.setCategorys("["+categoryKey+"]"); - restrictedCategory.setBrands("["+brandSid+"]"); - restrictedCategoryService.insert(restrictedCategory);*/ - // } } if(StringUtils.isNotBlank(p.getCode())){ @@ -329,13 +317,6 @@ public class PurchaseRequisitionService extends MybatisBaseService supervise = restrictedCategoryService.limitJudgement(category.getDictKey(), "supervise"); - if(supervise==null||supervise.size()==0){ - RestrictedCategory restrictedCategory=new RestrictedCategory(); - restrictedCategory.setCategorys(category.getDictKey()); - restrictedCategory.setCategorys("supervise"); - restrictedCategoryService.insert(restrictedCategory); - } p.setCategoryKey(category.getDictKey()); p.setCategory(category.getDictValue()); productInformationService.insert(p); @@ -395,6 +376,17 @@ public class PurchaseRequisitionService extends MybatisBaseService list=purchaseRequisitionProService.selectByMainSid(purchaseRequisitionSid); - addProductNum(purchaseRequisition,list); - List productNums=baseMapper.selectByPc(pc); - // 第一步，创建一个HSSFWorkbook，对应一个Excel文件 - HSSFWorkbook wb = new HSSFWorkbook(); - // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet - HSSFSheet sheet = wb.createSheet(sheetName); - // 合并单元格：参数：起始行, 终止行, 起始列, 终止列 - CellRangeAddress cra = new CellRangeAddress(0, 0, 0, 17); - sheet.addMergedRegion(cra); - // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 - - HSSFRow row = sheet.createRow(0); - // 第四步，创建单元格，并设置值表头 设置表头居中 - HSSFCellStyle style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式 - HSSFCell titleRow = row.createCell(0); - titleRow.setCellValue(title); - titleRow.setCellStyle(style); - - /*HSSFCell titleRow1 = row.createCell(1); - titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额：12345678"); - titleRow1.setCellStyle(style);*/ - - //声明列对象 - - createRow3(sheet, 1, col1, style); - - //创建内容 - for(int i=0;i list) { - Map map=new HashMap(); - map.put("pc",pu.getCode()); - baseMapper.deleteByMap(map); - for(int i = 0; i < list.size(); i++){ - PurchaseRequisitionProDto p=list.get(i); - ProductNum pr=new ProductNum(); - pr.setPc(pu.getCode()); - pr.setSupplierCode(pu.getSupplierCode());//供应商代码 - pr.setSupplierName(pu.getSupplierName());//供应商名称 - ProductInformationVo productInformation=productInformationService.selectByCode(p.getProCode()); - ///ProductInformationVo b=productInformationService.limitJudgement(code); - ProductInformationVo b=productInformationService.selectByCode(p.getProCode()); - String brandSid = b.getBrandSid(); - String categoryKey = b.getCategoryKey(); - - List restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); - if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ - pr.setState(1); - }else{ - pr.setState(0); - String remarks=""; - remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,"; - remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;"; - pr.setRemarks(remarks); - } - pr.setCode(p.getProCode()); - if(productInformation!=null){ - pr.setBrand(productInformation.getBrand()); - pr.setCategory(productInformation.getCategory()); - } - pr.setBarCode(p.getSecondCode());//商品条码 - pr.setName(p.getProName());//商品名称 - pr.setUnit(p.getUnit());//单位 - String packageTotalPrice = p.getPackageTotalPrice(); - String number = p.getNumber(); - BigDecimal v = new BigDecimal(packageTotalPrice).divide(new BigDecimal(number),2,BigDecimal.ROUND_HALF_UP); - pr.setPurchasePrice(v.toString());//进价 送货金额/数量=进价 -// pr.setValence(productInformation.getRationingPrice());//配价 -// String retailAmount = p.getRetailAmount();//零售金额 - String packageSpec = p.getPackageInsideNumber();//包装规格 -// String packageNumber = p.getPackageNumber();//包装数量 -// BigDecimal v1 = new BigDecimal(retailAmount).divide(new BigDecimal(packageSpec),4,BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(packageNumber),4,BigDecimal.ROUND_HALF_UP); - //double v1 = Double.parseDouble(retailAmount) / Double.parseDouble(packageSpec) / Double.parseDouble(packageNumber); -// pr.setPrice(v1.toString());//售价 零售金额/规格/包装数量=单价 - pr.setBoxGauge(packageSpec);//箱规 - pr.setNum(p.getNumber());//订货数量 - pr.setOrderAmount(p.getPackageTotalPrice());//订货金额 - pr.setTaxReceipt("");//税票 - pr.setDiscount("");//折扣 - - productNumService.insert(pr); - } - } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java index 7f6c94b4..e9347787 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java @@ -42,4 +42,6 @@ public interface PurchaseRequisitionProMapper extends BaseMapper selectValByCode(String proCode); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java index 44bae671..47f6384a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java @@ -65,4 +65,8 @@ public class PurchaseRequisitionProService extends MybatisBaseService selectValByCode(String proCode) { + return baseMapper.selectValByCode(proCode); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java index ab2c7b8b..e8a65dea 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java @@ -32,6 +32,7 @@ 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; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -55,6 +56,9 @@ public interface PurchaseRequisitionTobaccoMapper extends BaseMapper l); + @Select("select * from purchase_requisition_tobacco where code like CONCAT('%',#{date},'%') ") + List selectByDateForCode(@Param("date")String date); + //@Update("update purchase_requisition_tobacco set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml index 0f90a3b4..ebd0b096 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml @@ -9,14 +9,14 @@ `isEnable`, `createTime`, `modifyTime`, - `state`, `isDelete`, `mainSid`, `yczbh`, `storecode`, `storeName`, + `state`, `isDelete`, `mainSid`, `yCode`, `storecode`, `storeName`, `price`, `pc`) values ( '0',UUID(), NULL,NULL, '1', #{item.createTime},#{item.modifyTime}, - #{item.state},'0',#{item.mainSid},#{item.yczbh}, + #{item.state},'0',#{item.mainSid},#{item.yCode}, #{item.storeCode}, #{item.storeName},#{item.price},#{item.pc} ) diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java index 831d64c4..5083cdb4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java @@ -87,7 +87,7 @@ public class PurchaseRequisitionTobaccoRest { public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file ){ ResultBean rb = ResultBean.fireFail(); purchaseRequisitionTobaccoService.readBrandPeriodSorXls1(file); - return rb; + return rb.success(); } @ApiOperation("删除记录") @GetMapping("/del/{ids}") diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java index d13d7e0a..918ceea0 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java @@ -257,7 +257,7 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService5){ Map sd_map=new HashMap<>(); try{ - sd_map.put("yczbh",r.get(2));//卷烟代码 + sd_map.put("yCode",r.get(2));//卷烟代码 String o = r.get(3).toString(); String[] split = o.split("]"); String substring = split[0].substring(split[0].indexOf("[")+1, split[0].length()); @@ -298,6 +298,12 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService list= baseMapper.selectByDateForCode(format); + int size = list.size(); + int r=size+1; + sd.setCode(format+r); baseMapper.insert(sd); for(List l:listArray){ log.info("batchInsert-start:{}",l.size()); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java index 4e7d7caa..3823eeff 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java @@ -27,6 +27,7 @@ package com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,6 +53,8 @@ public interface PurchaseRequisitionTobaccoDetailsMapper extends BaseMapper l); + @Delete("delete from purchase_requisition_tobacco_details where mainSid=#{mainSid}") + void deleteByMainSid(@Param("mainSid")String mainSid); //@Update("update purchase_requisition_tobacco_details set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml index 88b3b8a3..3ac8cfcb 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml @@ -3,17 +3,12 @@ - insert into `purchase_requisition_store` ( `lockVersion`, `sid`, - `createSid`, `modifySid`, `isEnable`, - `createTime`, `modifyTime`, - `state`, `isDelete`, `mainSid`, `yCode`, - `prodCode`, `prodName`, `pfj`, `yhl`, - `ddl`, `price`, `cjmc`, `lszdj`) values + insert into `purchase_requisition_tobacco_details` ( `lockVersion`, `sid`,`createSid`, `modifySid`, + `isEnable`,`createTime`, `modifyTime`,`state`, `isDelete`, `mainSid`, `yCode`,`prodCode`, + `prodName`, `pfj`, `yhl`,`ddl`, `price`, `cjmc`, `lszdj`) values - ('2',UUID(),NULL,NULL,'1', - #{item.createTime}, #{item.createTime},'1','1', - #{item.mainSid},#{item.yCode},#{item.prodCode},#{item.prodName}, - #{item.pfj},#{item.yhl},#{item.ddl},#{item.price},#{item.cjmc},#{item.lszdj}); + ('2',UUID(),NULL,NULL,'1',#{item.createTime}, #{item.modifyTime},'1','1', + #{item.mainSid},#{item.yCode},#{item.prodCode},#{item.prodName},#{item.pfj},#{item.yhl},#{item.ddl},#{item.price},#{item.cjmc},#{item.lszdj}) \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java index 5954e545..07d71fa3 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java @@ -85,10 +85,10 @@ public class PurchaseRequisitionTobaccoDetailsRest { } @ApiOperation(" ") @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) - public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, @RequestBody String sid){ + public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, @RequestParam( name ="sid", required = false)String sid){ ResultBean rb = ResultBean.fireFail(); purchaseRequisitionTobaccoDetailsService.readBrandPeriodSorXls1(file,sid); - return rb; + return rb.success(); } @ApiOperation("删除记录") @GetMapping("/del/{ids}") diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java index 1218f4a1..ccf7038a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java @@ -123,17 +123,17 @@ public class PurchaseRequisitionTobaccoDetailsService extends MybatisBaseService if(rowNum>0){ Map sd_map=new HashMap<>(); try{ - sd_map.put("yCode",r.get(0));//卷烟代码 - sd_map.put("storeCode","");//商品代码 - sd_map.put("prodName",r.get(1));//商品名称 - sd_map.put("pfj",r.get(2));//批发价 - sd_map.put("yhl",r.get(3));//要货量 - sd_map.put("ddl",r.get(4));//订单量 - sd_map.put("price",r.get(5));//金额 - BigDecimal price = new BigDecimal(r.get(5).toString()); + sd_map.put("yCode",r.get(0).toString().trim());//卷烟代码 + sd_map.put("prodCode","12");//商品代码 + sd_map.put("prodName",r.get(1).toString().trim());//商品名称 + sd_map.put("pfj",r.get(2).toString().trim());//批发价 + sd_map.put("yhl",r.get(3).toString().trim());//要货量 + sd_map.put("ddl",r.get(4).toString().trim());//订单量 + sd_map.put("price",r.get(5).toString().trim());//金额 + BigDecimal price = new BigDecimal(r.get(5).toString().trim()); bigDecimal= bigDecimal.add(price); - sd_map.put("cjmc",r.get(6));//厂家名称 - sd_map.put("lszdj",r.get(7));//零售指导价 + sd_map.put("cjmc",r.get(6).toString().trim());//厂家名称 + sd_map.put("lszdj",r.get(7).toString().trim());//零售指导价 sd_map.put("mainSid",sid);//关联表sid PurchaseRequisitionTobaccoDetails sd=new PurchaseRequisitionTobaccoDetails(); BeanUtil.fillBeanWithMap(sd_map, sd, true); @@ -160,6 +160,10 @@ public class PurchaseRequisitionTobaccoDetailsService extends MybatisBaseService public void doAfterAllAnalysed() { List> listArray = new ArrayList>(); int listSize = salesDatas.size(); + + if(listSize>0){ + baseMapper.deleteByMainSid(salesDatas.get(0).getMainSid()); + } int pageSize=5000; for (int i = 0; i < listSize; i += pageSize) { int toIndex = Math.min(i + pageSize, listSize); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandMapper.java index b05d3608..77a06982 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandMapper.java @@ -62,4 +62,6 @@ public interface RestrictedBrandMapper extends BaseMapper { @Select("select * from restricted_brand") List selectListVo(); + @Select("select * from restricted_brand where code=#{brandCode}") + RestrictedBrand selectByBrands(@Param("brandCode")String brandCode); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandService.java index 37df9ad7..e81084eb 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandService.java @@ -181,4 +181,8 @@ public class RestrictedBrandService extends MybatisBaseService List selectListVo(); @Select("select * from restricted_category where categorys like CONCAT('%',#{categoryKey},'%') and brands like CONCAT('%',#{brandCode},'%')") List limitJudgement(@Param("categoryKey")String categoryKey, @Param("brandCode")String brandCode); - @Select("select * from restricted_category where categorys like CONCAT('%',#{categoryKey},'%') ") - List selectByCategorys(@Param("categoryKey")String categoryKey); + @Select("select * from restricted_category where categoryKey = #{categoryKey} ") + RestrictedCategory selectByCategorys(@Param("categoryKey")String categoryKey); @Select("select * from restricted_category where brands like CONCAT('%',#{brandCode},'%') ") List selectByBrands(@Param("brandCode")String brand); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryService.java index 90d741b7..2b9087dc 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryService.java @@ -30,6 +30,12 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.supervise.portal.api.brandinfo.BrandInfoVo; +import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; +import com.yxt.supervise.portal.api.restrictedbrand.RestrictedBrand; +import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; +import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; +import com.yxt.supervise.portal.biz.restrictedbrand.RestrictedBrandService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -49,10 +55,13 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellType; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Project: yxt-supervise(宇信通监管)
@@ -70,6 +79,12 @@ import java.util.List; @Slf4j @Service public class RestrictedCategoryService extends MybatisBaseService { + @Resource + private DictCommonService dictCommonService; + @Resource + private BrandInfoService brandInfoService; + @Resource + private RestrictedBrandService restrictedBrandService; private QueryWrapper createQueryWrapper(RestrictedCategoryQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -146,13 +161,13 @@ public class RestrictedCategoryService extends MybatisBaseService limitJudgement(String categoryKey, String brandSid) { - List r=baseMapper.selectByCategorys(categoryKey); - if(r==null||r.size()==0){ - return new ArrayList<>(); + public Map limitJudgement(String categoryKey, String brandCode) { + Map result=new HashMap<>(); + RestrictedCategory r=baseMapper.selectByCategorys(categoryKey); + result.put("success","1"); + String msg=""; + if(r==null ){ + result.put("success","0"); + DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(categoryKey, "category"); + if(category==null){ + msg=msg+categoryKey+"商品品类不存在;"; + }else{ + msg=msg+category.getDictValue()+"["+categoryKey+"]"+"不符合监管品类;"; + } + } - List r1=baseMapper.selectByBrands(brandSid); - if(r1==null||r1.size()==0){ - return new ArrayList<>(); + RestrictedBrand r1=restrictedBrandService.selectByBrands(brandCode); + if(r1==null ){ + result.put("success","0"); + BrandInfoVo brandInfoVo = brandInfoService.selectByCode(brandCode); + if(brandInfoVo==null){ + msg=msg+categoryKey+"商品品牌不存在;"; + }else{ + msg=msg+brandInfoVo.getName()+"["+brandCode+"]"+"不符合监管品牌;"; + } } - return r1;//baseMapper.limitJudgement(categoryKey,brandSid); + result.put("msg",msg); + return result;//baseMapper.limitJudgement(categoryKey,brandSid); } } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java index 60f129fa..188756b1 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java @@ -210,7 +210,6 @@ public class SalesDataService extends MybatisBaseService list=new ArrayList<>(); if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isNotBlank(storeCode)){ list=baseMapper.selectByDateAndstoreCode(pc,storeCode); @@ -383,7 +383,7 @@ public class SalesDataService extends MybatisBaseService storeInfos=storeInfoService.selectLimitStores(); - List lps=purchaseRequisitionProService.selectByCode(proCode); + List lps=purchaseRequisitionProService.selectValByCode(proCode); if((lps==null||lps.size()==0)){//&&s.getCategorys().indexOf("0811")<0 烟 continue; }