yxt_djz 2 years ago
parent
commit
964c5e701c
  1. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java
  2. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java
  3. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java
  4. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java
  5. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java
  6. 8
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java
  7. 8
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java
  8. 8
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java
  9. 8
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java
  10. 8
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java
  11. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategory.java
  12. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDetailsVo.java
  13. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryDto.java
  14. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryQuery.java
  15. 4
      yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/restrictedcategory/RestrictedCategoryVo.java
  16. 11
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java
  17. 48
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java
  18. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java
  19. 2
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java
  20. 163
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java
  21. 2
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java
  22. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProService.java
  23. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java
  24. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml
  25. 2
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java
  26. 8
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java
  27. 3
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java
  28. 15
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml
  29. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java
  30. 24
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java
  31. 2
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandMapper.java
  32. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedbrand/RestrictedBrandService.java
  33. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryMapper.java
  34. 52
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryService.java
  35. 4
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java

4
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; // 更新者 private String modifySid; // 更新者
@ApiModelProperty("关联表sid") @ApiModelProperty("关联表sid")
private String mainSid; // 关联表sid private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("烟草证编码")
private String yczbh; // 卷烟代 private String yCode; // 烟草证编
@ApiModelProperty("门店代码") @ApiModelProperty("门店代码")
private String storeCode; // 门店代码 private String storeCode; // 门店代码
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")

4
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("更新者") @ApiModelProperty("更新者")
private String modifySid; // 更新者 private String modifySid; // 更新者
private String mainSid; // 关联表sid private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("烟草证编码")
private String yczbh; // 卷烟代 private String yCode; // 烟草证编
@ApiModelProperty("门店代码") @ApiModelProperty("门店代码")
private String storeCode; // 门店代码 private String storeCode; // 门店代码
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")

4
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("更新者") @ApiModelProperty("更新者")
private String modifySid; // 更新者 private String modifySid; // 更新者
private String mainSid; // 关联表sid private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("烟草证编码")
private String yczbh; // 卷烟代 private String yCode; // 烟草证编
@ApiModelProperty("门店代码") @ApiModelProperty("门店代码")
private String storeCode; // 门店代码 private String storeCode; // 门店代码
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")

4
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("更新者") @ApiModelProperty("更新者")
private String modifySid; // 更新者 private String modifySid; // 更新者
private String mainSid; // 关联表sid private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("烟草证编码")
private String yczbh; // 卷烟代 private String yCode; // 烟草证编
@ApiModelProperty("门店代码") @ApiModelProperty("门店代码")
private String storeCode; // 门店代码 private String storeCode; // 门店代码
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")

4
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("更新者") @ApiModelProperty("更新者")
private String modifySid; // 更新者 private String modifySid; // 更新者
private String mainSid; // 关联表sid private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("烟草证编码")
private String yczbh; // 卷烟代 private String yCode; // 烟草证编
@ApiModelProperty("门店代码") @ApiModelProperty("门店代码")
private String storeCode; // 门店代码 private String storeCode; // 门店代码
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")

8
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 private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("卷烟代码")
private String yCode; // 卷烟代码 private String yCode; // 卷烟代码
@ApiModelProperty("门店名称编码") @ApiModelProperty("商品编码")
private String storeCode; // 门店名称编码 private String prodCode; // 门店名称编码
@ApiModelProperty("门店名称") @ApiModelProperty("商品名称")
private String storeName; // 门店名称 private String prodName; // 门店名称
@ApiModelProperty("批发价") @ApiModelProperty("批发价")
private String pfj; // 批发价 private String pfj; // 批发价
@ApiModelProperty("要货量") @ApiModelProperty("要货量")

8
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 private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("卷烟代码")
private String yCode; // 卷烟代码 private String yCode; // 卷烟代码
@ApiModelProperty("门店名称编码") @ApiModelProperty("商品编码")
private String storeCode; // 门店名称编码 private String prodCode; // 门店名称编码
@ApiModelProperty("门店名称") @ApiModelProperty("商品名称")
private String storeName; // 门店名称 private String prodName; // 门店名称
@ApiModelProperty("批发价") @ApiModelProperty("批发价")
private String pfj; // 批发价 private String pfj; // 批发价
@ApiModelProperty("要货量") @ApiModelProperty("要货量")

8
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 private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("卷烟代码")
private String yCode; // 卷烟代码 private String yCode; // 卷烟代码
@ApiModelProperty("门店名称编码") @ApiModelProperty("商品编码")
private String storeCode; // 门店名称编码 private String prodCode; // 门店名称编码
@ApiModelProperty("门店名称") @ApiModelProperty("商品名称")
private String storeName; // 门店名称 private String prodName; // 门店名称
@ApiModelProperty("批发价") @ApiModelProperty("批发价")
private String pfj; // 批发价 private String pfj; // 批发价
@ApiModelProperty("要货量") @ApiModelProperty("要货量")

8
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 private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("卷烟代码")
private String yCode; // 卷烟代码 private String yCode; // 卷烟代码
@ApiModelProperty("门店名称编码") @ApiModelProperty("商品编码")
private String storeCode; // 门店名称编码 private String prodCode; // 门店名称编码
@ApiModelProperty("门店名称") @ApiModelProperty("商品名称")
private String storeName; // 门店名称 private String prodName; // 门店名称
@ApiModelProperty("批发价") @ApiModelProperty("批发价")
private String pfj; // 批发价 private String pfj; // 批发价
@ApiModelProperty("要货量") @ApiModelProperty("要货量")

8
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 private String mainSid; // 关联表sid
@ApiModelProperty("卷烟代码") @ApiModelProperty("卷烟代码")
private String yCode; // 卷烟代码 private String yCode; // 卷烟代码
@ApiModelProperty("门店名称编码") @ApiModelProperty("商品编码")
private String storeCode; // 门店名称编码 private String prodCode; // 门店名称编码
@ApiModelProperty("门店名称") @ApiModelProperty("商品名称")
private String storeName; // 门店名称 private String prodName; // 门店名称
@ApiModelProperty("批发价") @ApiModelProperty("批发价")
private String pfj; // 批发价 private String pfj; // 批发价
@ApiModelProperty("要货量") @ApiModelProperty("要货量")

4
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("监管品类") @ApiModelProperty("监管品类")
private String categorys; // 监管品类 private String categorys; // 监管品类
@ApiModelProperty("监管品") @ApiModelProperty("监管品类Key")
private String brands; // value值 private String categoryKey; // 监管品类Key
} }

4
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 private String sid; // sid
@ApiModelProperty("监管品类") @ApiModelProperty("监管品类")
private String categorys; // 监管品类 private String categorys; // 监管品类
@ApiModelProperty("监管品") @ApiModelProperty("监管品类Key")
private String brands; // value值 private String categoryKey; // 监管品类Key
} }

4
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 private String sid; // sid
@ApiModelProperty("监管品类") @ApiModelProperty("监管品类")
private String categorys; // 监管品类 private String categorys; // 监管品类
@ApiModelProperty("监管品") @ApiModelProperty("监管品类Key")
private String brands; // value值 private String categoryKey; // 监管品类Key
} }

4
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("监管品类") @ApiModelProperty("监管品类")
private String categorys; // 监管品类 private String categorys; // 监管品类
@ApiModelProperty("监管品") @ApiModelProperty("监管品类Key")
private String brands; // value值 private String categoryKey; // 监管品类Key
} }

4
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 private String sid; // sid
@ApiModelProperty("监管品类") @ApiModelProperty("监管品类")
private String categorys; // 监管品类 private String categorys; // 监管品类
@ApiModelProperty("监管品") @ApiModelProperty("监管品类Key")
private String brands; // value值 private String categoryKey; // 监管品类Key
} }

11
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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.util.Map;
/** /**
* Project: com.supervise(宇信通监管) <br/> * Project: com.supervise(宇信通监管) <br/>
@ -156,17 +157,19 @@ public class ProductNumRest implements ProductNumFeign {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
/*@ApiOperation(" ") @ApiOperation(" ")
@RequestMapping(value = "/products", method = RequestMethod.GET) @RequestMapping(value = "/products", method = RequestMethod.GET)
public ResultBean products(HttpServletRequest request, HttpServletResponse response){ public ResultBean products(HttpServletRequest request, HttpServletResponse response){
String pc=request.getParameter("code"); String pc=request.getParameter("code");
ResultBean rb = ResultBean.fireFail(); //excel标题 ResultBean rb = ResultBean.fireFail(); //excel标题
//excel文件名 //excel文件名
String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls"; String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls";
HSSFWorkbook wb = productNumService.products( pc); Map<String, Object> products = productNumService.products(pc);
HSSFWorkbook wb = (HSSFWorkbook) products.get("wb");
String pd = products.get("pd").toString();
//响应到客户端 //响应到客户端
try { try {
this.setResponseHeader(response, fileName); this.setResponseHeader(response, pd+fileName);
OutputStream os = response.getOutputStream(); OutputStream os = response.getOutputStream();
wb.write(os); wb.write(os);
os.flush(); os.flush();
@ -175,5 +178,5 @@ public class ProductNumRest implements ProductNumFeign {
e.printStackTrace(); e.printStackTrace();
} }
return rb; return rb;
}*/ }
} }

48
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<ProductNumMapper, Prod
String brandSid = b.getBrandSid(); String brandSid = b.getBrandSid();
String categoryKey = b.getCategoryKey(); String categoryKey = b.getCategoryKey();
List<RestrictedCategory> restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); Map<String,String> map=restrictedCategoryService.limitJudgement(categoryKey,brandSid);
if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ if("081101,081102,081103".indexOf(categoryKey)>=0|| "1".equals(map.get("success"))){
pr.setState(1); pr.setState(1);
}else{ }else{
pr.setState(0); pr.setState(0);
String remarks=""; String remarks=map.get("msg");
remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,";
remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;";
pr.setRemarks(remarks); pr.setRemarks(remarks);
} }
pr.setCode(code); pr.setCode(code);
@ -461,23 +459,25 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
c = row1.createCell(0); c = row1.createCell(0);
c.setCellValue(col[0]+" "+ col[1]+" "+ col[2]); c.setCellValue(col[0]+" "+ col[1]+" "+ col[2]);
} }
/*@Resource
@Resource
private PurchaseRequisitionService purchaseRequisitionService; private PurchaseRequisitionService purchaseRequisitionService;
@Resource @Resource
private PurchaseRequisitionProService purchaseRequisitionProService;*/ private PurchaseRequisitionProService purchaseRequisitionProService;
/** /**
* *
* 带批次导出采购订单的商品审批结果 * 带批次导出采购订单的商品审批结果
* @param pc * @param pc
* @return * @return
*/ */
/*public HSSFWorkbook products(String pc){ public Map<String,Object> products(String pc){
String title = "重点品类商品订货明细限定情况"; String title = "商品订货明细限定情况";
String[] col = {"审核单号","状态","合计金额"}; String[] col = {"审核单号","状态","合计金额"};
String[] col1 = {"序号","采购订单编号","厂商编码","厂商名称","商品代码","商品条码","商品名称","单位","进价","箱规", String[] col1 = {"序号","采购订单编号","厂商编码","厂商名称","商品代码","商品条码","商品名称","单位","进价","箱规",
"订货数量","订货金额(元)","合计","税票","降价折扣%","判定结果","备注"}; "订货数量","订货金额(元)","合计","税票","降价折扣%","判定结果","备注"};
//sheet名 //sheet名
String sheetName = pc+"重点品类商品订货明细限定情况"; String sheetName = pc+"商品订货明细限定情况";
//创建HSSFWorkbook //创建HSSFWorkbook
PurchaseRequisition purchaseRequisition=purchaseRequisitionService.selectByCode(pc); PurchaseRequisition purchaseRequisition=purchaseRequisitionService.selectByCode(pc);
String purchaseRequisitionSid = purchaseRequisition.getSid(); String purchaseRequisitionSid = purchaseRequisition.getSid();
@ -502,14 +502,14 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
titleRow.setCellValue(title); titleRow.setCellValue(title);
titleRow.setCellStyle(style); titleRow.setCellStyle(style);
*//*HSSFCell titleRow1 = row.createCell(1); /*HSSFCell titleRow1 = row.createCell(1);
titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额:12345678"); titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额:12345678");
titleRow1.setCellStyle(style);*//* titleRow1.setCellStyle(style);*/
//声明列对象 //声明列对象
createRow3(sheet, 1, col1, style); createRow3(sheet, 1, col1, style);
String pd="符合";
//创建内容 //创建内容
for(int i=0;i<productNums.size();i++){ for(int i=0;i<productNums.size();i++){
row = sheet.createRow(i + 2); row = sheet.createRow(i + 2);
@ -532,12 +532,16 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
row.createCell(12).setCellValue("0"); row.createCell(12).setCellValue("0");
row.createCell(13).setCellValue(productNums.get(i).getTaxReceipt()); row.createCell(13).setCellValue(productNums.get(i).getTaxReceipt());
row.createCell(14).setCellValue(productNums.get(i).getDiscount()); row.createCell(14).setCellValue(productNums.get(i).getDiscount());
row.createCell(15).setCellValue(productNums.get(i).getState()==1?"符合":"不符合"); pd=productNums.get(i).getState()==1?"符合":"不符合";
row.createCell(15).setCellValue(pd);
row.createCell(16).setCellValue(productNums.get(i).getRemarks()); row.createCell(16).setCellValue(productNums.get(i).getRemarks());
} }
return wb; Map<String,Object> map=new HashMap<>();
}*/ map.put("wb",wb);
/* map.put("pd",pd);
return map;
}
private void addProductNum(PurchaseRequisition pu,List<PurchaseRequisitionProDto> list) { private void addProductNum(PurchaseRequisition pu,List<PurchaseRequisitionProDto> list) {
Map<String,Object> map=new HashMap<String,Object>(); Map<String,Object> map=new HashMap<String,Object>();
map.put("pc",pu.getCode()); map.put("pc",pu.getCode());
@ -554,14 +558,12 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
String brandSid = b.getBrandSid(); String brandSid = b.getBrandSid();
String categoryKey = b.getCategoryKey(); String categoryKey = b.getCategoryKey();
List<RestrictedCategory> restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); Map<String,String> maps=restrictedCategoryService.limitJudgement(categoryKey,brandSid);
if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ if("081101,081102,081103".indexOf(categoryKey)>=0||"1".equals(maps.get("success"))){
pr.setState(1); pr.setState(1);
}else{ }else{
pr.setState(0); pr.setState(0);
String remarks=""; String remarks=maps.get("msg");
remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,";
remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;";
pr.setRemarks(remarks); pr.setRemarks(remarks);
} }
pr.setCode(p.getProCode()); pr.setCode(p.getProCode());
@ -591,5 +593,5 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
baseMapper.insert(pr); baseMapper.insert(pr);
} }
}*/ }
} }

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

@ -32,7 +32,7 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
@Select("select * from purchase_requisition ") @Select("select * from purchase_requisition ")
List<PurchaseRequisition> selectAll(); List<PurchaseRequisition> selectAll();
@Select(" SELECT sbi.codeUnified, sbi.name ,1,SUM(packageTotalPrice) billTotalPrice, " + @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 " + " MAX(pr.`arrivalDate`) arrivalDate FROM `supplier_bank_info` sbi " +
"LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " + "LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " +
"LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " + "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " +
@ -60,4 +60,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
PurchaseRequisition selectBySid(String sid); PurchaseRequisition selectBySid(String sid);
@Select("select * from product_num where pc =#{pc} ") @Select("select * from product_num where pc =#{pc} ")
List<ProductNum> selectByPc(@Param("pc")String pc); List<ProductNum> selectByPc(@Param("pc")String pc);
@Delete(" DELETE FROM hz_ztspglhzb")
void deleteAll();
} }

2
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标题 ResultBean rb = ResultBean.fireFail(); //excel标题
//excel文件名 //excel文件名
String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls"; String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls";
HSSFWorkbook wb = purchaseRequisitionService.products( pc); HSSFWorkbook wb =null;// purchaseRequisitionService.products( pc);
//响应到客户端 //响应到客户端
try { try {
this.setResponseHeader(response, fileName); this.setResponseHeader(response, fileName);

163
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<PurchaseRequi
public void ztspglhzb() throws ParseException { public void ztspglhzb() throws ParseException {
Date date = new Date(); Date date = new Date();
SimpleDateFormat sdf1=new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat sdf1=new SimpleDateFormat("yyyyMMdd");
baseMapper.deleteAll();
List<Map<String,Object>> list=baseMapper.ztspglhzb();//--在途商品管理汇总表 List<Map<String,Object>> list=baseMapper.ztspglhzb();//--在途商品管理汇总表
for(Map<String,Object> m:list){ for(Map<String,Object> m:list){
String billTotalPrice= m.get("billTotalPrice")!=null?m.get("billTotalPrice").toString():"0";//订单总额 String billTotalPrice= m.get("billTotalPrice")!=null?m.get("billTotalPrice").toString():"0";//订单总额
@ -299,20 +300,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
productInformationVo.setNewestPurchasePrice(divide.toString()); productInformationVo.setNewestPurchasePrice(divide.toString());
ProductInformation pif=new ProductInformation(); ProductInformation pif=new ProductInformation();
BeanUtil.copyProperties(productInformationVo,pif); BeanUtil.copyProperties(productInformationVo,pif);
productInformationService.updateById(pif); productInformationService.updateById(pif);
String brandSid = pif.getBrandSid();
String categoryKey = pif.getCategoryKey();
// List<RestrictedCategory> 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())){ if(StringUtils.isNotBlank(p.getCode())){
@ -329,13 +317,6 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
BeanUtil.copyProperties(category,dictCommon); BeanUtil.copyProperties(category,dictCommon);
dictCommonService.insert(dictCommon); dictCommonService.insert(dictCommon);
} }
List<RestrictedCategory> 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.setCategoryKey(category.getDictKey());
p.setCategory(category.getDictValue()); p.setCategory(category.getDictValue());
productInformationService.insert(p); productInformationService.insert(p);
@ -395,6 +376,17 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
prp.setRetailAmount(value); prp.setRetailAmount(value);
} }
} }
if (i == 51) {//品类
brandIdHSSFCell.setCellType(CellType.STRING);
if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
String value= brandIdHSSFCell.getStringCellValue();
String[] split = value.split("\\[");
String v = split[0];//类别value
String key=split[1].replace("]","");//key
prp.setCategory(v);
prp.setCategoryKey(key);
}
}
if (i == 12) {//配货价格 if (i == 12) {//配货价格
brandIdHSSFCell.setCellType(CellType.STRING); brandIdHSSFCell.setCellType(CellType.STRING);
if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) { if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
@ -437,11 +429,11 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
purchaseRequisitionService.insert(pr); purchaseRequisitionService.insert(pr);
for (PurchaseRequisitionPro p: prps){ for (PurchaseRequisitionPro p: prps){
purchaseRequisitionProService.insert(p); purchaseRequisitionProService.insert(p);
String proCode = p.getProCode(); /* String proCode = p.getProCode();*/
int row=purchaseRequisitionProService.selectProdCodeTable(proCode); /*int row=purchaseRequisitionProService.selectProdCodeTable(proCode);
if(row==0){ if(row==0){
purchaseRequisitionProService.insertProdCodeTable(proCode); purchaseRequisitionProService.insertProdCodeTable(proCode);
} }*/
} }
GdRescategoryProdService.resetCache(); GdRescategoryProdService.resetCache();
String x = JSON.toJSONString(lisss); String x = JSON.toJSONString(lisss);
@ -611,78 +603,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
public PurchaseRequisition selectBySid(String sid) { public PurchaseRequisition selectBySid(String sid) {
return baseMapper.selectBySid(sid); return baseMapper.selectBySid(sid);
} }
/**
*
* 带批次导出采购订单的商品审批结果
* @param pc
* @return
*/
public HSSFWorkbook products(String pc){
String title = "重点品类商品订货明细限定情况";
String[] col = {"审核单号","状态","合计金额"};
String[] col1 = {"序号","采购订单编号","厂商编码","厂商名称","商品代码","商品条码","商品名称","单位","进价","箱规",
"订货数量","订货金额(元)","合计","税票","降价折扣%","判定结果","备注"};
//sheet名
String sheetName = pc+"重点品类商品订货明细限定情况";
//创建HSSFWorkbook
PurchaseRequisition purchaseRequisition=purchaseRequisitionService.selectByCode(pc);
String purchaseRequisitionSid = purchaseRequisition.getSid();
List<PurchaseRequisitionProDto> list=purchaseRequisitionProService.selectByMainSid(purchaseRequisitionSid);
addProductNum(purchaseRequisition,list);
List<ProductNum> 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<productNums.size();i++){
row = sheet.createRow(i + 2);
//将内容按顺序赋给对应的列对象
//"序号","厂商编码","厂商名称","商品代码","商品条码","商品名称","单位","进价","售价","箱规","订货数量","订货金额(元)","合计","税票","降价折扣%"
row.createCell(0).setCellValue(i+1);
row.createCell(1).setCellValue(pc);
row.createCell(2).setCellValue(productNums.get(i).getSupplierCode());
row.createCell(3).setCellValue(productNums.get(i).getSupplierName());
row.createCell(4).setCellValue(productNums.get(i).getCode());
row.createCell(5).setCellValue(productNums.get(i).getBarCode());
row.createCell(6).setCellValue(productNums.get(i).getName());
row.createCell(7).setCellValue(productNums.get(i).getUnit());
row.createCell(8).setCellValue(productNums.get(i).getPurchasePrice());//进价
// row.createCell(9).setCellValue(productNums.get(i).getValence());//进价
// row.createCell(10).setCellValue(productNums.get(i).getPrice());//售价
row.createCell(9).setCellValue(productNums.get(i).getBoxGauge());
row.createCell(10).setCellValue(productNums.get(i).getNum());
row.createCell(11).setCellValue(productNums.get(i).getOrderAmount());
row.createCell(12).setCellValue("0");
row.createCell(13).setCellValue(productNums.get(i).getTaxReceipt());
row.createCell(14).setCellValue(productNums.get(i).getDiscount());
row.createCell(15).setCellValue(productNums.get(i).getState()==1?"符合":"不符合");
row.createCell(16).setCellValue(productNums.get(i).getRemarks());
}
return wb;
}
private void createRow3(HSSFSheet sheet, int rownum, String[] col1, HSSFCellStyle style) { private void createRow3(HSSFSheet sheet, int rownum, String[] col1, HSSFCellStyle style) {
//声明列对象 //声明列对象
@ -696,58 +617,4 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
} }
} }
private void addProductNum(PurchaseRequisition pu,List<PurchaseRequisitionProDto> list) {
Map<String,Object> map=new HashMap<String,Object>();
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<RestrictedCategory> 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);
}
}
} }

2
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<PurchaseRequisi
int insertProdCodeTable(@Param("proCode")String proCode); int insertProdCodeTable(@Param("proCode")String proCode);
int delByMainSids(@Param("list") String[] split); int delByMainSids(@Param("list") String[] split);
@Select("select * from gd_rescategory_prod where prodCode=#{proCode}")
List<PurchaseRequisitionPro> selectValByCode(String proCode);
} }

4
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<PurchaseRe
public int delByMainSids(String[] split) { public int delByMainSids(String[] split) {
return baseMapper.delByMainSids(split); return baseMapper.delByMainSids(split);
} }
public List<PurchaseRequisitionPro> selectValByCode(String proCode) {
return baseMapper.selectValByCode(proCode);
}
} }

4
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.Insert;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
@ -55,6 +56,9 @@ public interface PurchaseRequisitionTobaccoMapper extends BaseMapper<PurchaseReq
void batchInsert(List<PurchaseRequisitionStore> l); void batchInsert(List<PurchaseRequisitionStore> l);
@Select("select * from purchase_requisition_tobacco where code like CONCAT('%',#{date},'%') ")
List<PurchaseRequisitionTobacco> selectByDateForCode(@Param("date")String date);
//@Update("update purchase_requisition_tobacco set name=#{msg} where id=#{id}") //@Update("update purchase_requisition_tobacco set name=#{msg} where id=#{id}")
//IPage<PurchaseRequisitionTobaccoVo> voPage(IPage<PurchaseRequisitionTobacco> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseRequisitionTobacco> qw); //IPage<PurchaseRequisitionTobaccoVo> voPage(IPage<PurchaseRequisitionTobacco> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseRequisitionTobacco> qw);

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

@ -9,14 +9,14 @@
`isEnable`, `isEnable`,
`createTime`, `createTime`,
`modifyTime`, `modifyTime`,
`state`, `isDelete`, `mainSid`, `yczbh`, `storecode`, `storeName`, `state`, `isDelete`, `mainSid`, `yCode`, `storecode`, `storeName`,
`price`, `pc`) values `price`, `pc`) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( '0',UUID(), ( '0',UUID(),
NULL,NULL, NULL,NULL,
'1', '1',
#{item.createTime},#{item.modifyTime}, #{item.createTime},#{item.modifyTime},
#{item.state},'0',#{item.mainSid},#{item.yczbh}, #{item.state},'0',#{item.mainSid},#{item.yCode},
#{item.storeCode}, #{item.storeCode},
#{item.storeName},#{item.price},#{item.pc} #{item.storeName},#{item.price},#{item.pc}
) )

2
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 ){ public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file ){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
purchaseRequisitionTobaccoService.readBrandPeriodSorXls1(file); purchaseRequisitionTobaccoService.readBrandPeriodSorXls1(file);
return rb; return rb.success();
} }
@ApiOperation("删除记录") @ApiOperation("删除记录")
@GetMapping("/del/{ids}") @GetMapping("/del/{ids}")

8
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 MybatisBaseService<Purcha
if(rowNum>5){ if(rowNum>5){
Map<String,Object> sd_map=new HashMap<>(); Map<String,Object> sd_map=new HashMap<>();
try{ try{
sd_map.put("yczbh",r.get(2));//卷烟代码 sd_map.put("yCode",r.get(2));//卷烟代码
String o = r.get(3).toString(); String o = r.get(3).toString();
String[] split = o.split("]"); String[] split = o.split("]");
String substring = split[0].substring(split[0].indexOf("[")+1, split[0].length()); String substring = split[0].substring(split[0].indexOf("[")+1, split[0].length());
@ -298,6 +298,12 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService<Purcha
} }
PurchaseRequisitionTobacco sd=new PurchaseRequisitionTobacco(); PurchaseRequisitionTobacco sd=new PurchaseRequisitionTobacco();
BeanUtil.fillBeanWithMap(map, sd, true); BeanUtil.fillBeanWithMap(map, sd, true);
SimpleDateFormat sdf =new SimpleDateFormat("yyyyMMdd");
String format = sdf.format(new Date());
List<PurchaseRequisitionTobacco> list= baseMapper.selectByDateForCode(format);
int size = list.size();
int r=size+1;
sd.setCode(format+r);
baseMapper.insert(sd); baseMapper.insert(sd);
for(List<PurchaseRequisitionStore> l:listArray){ for(List<PurchaseRequisitionStore> l:listArray){
log.info("batchInsert-start:{}",l.size()); log.info("batchInsert-start:{}",l.size());

3
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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails; 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.Insert;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -52,6 +53,8 @@ public interface PurchaseRequisitionTobaccoDetailsMapper extends BaseMapper<Purc
void insertIntoImportDataInfo(@Param("date") String date, @Param("remarks") String s); void insertIntoImportDataInfo(@Param("date") String date, @Param("remarks") String s);
void batchInsert(List<PurchaseRequisitionTobaccoDetails> l); void batchInsert(List<PurchaseRequisitionTobaccoDetails> 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}") //@Update("update purchase_requisition_tobacco_details set name=#{msg} where id=#{id}")
//IPage<PurchaseRequisitionTobaccoDetailsVo> voPage(IPage<PurchaseRequisitionTobaccoDetails> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseRequisitionTobaccoDetails> qw); //IPage<PurchaseRequisitionTobaccoDetailsVo> voPage(IPage<PurchaseRequisitionTobaccoDetails> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseRequisitionTobaccoDetails> qw);

15
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml

@ -3,17 +3,12 @@
<mapper namespace="com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsMapper"> <mapper namespace="com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<insert id="batchInsert" parameterType="List"> <insert id="batchInsert" parameterType="List">
insert into `purchase_requisition_store` ( `lockVersion`, `sid`, insert into `purchase_requisition_tobacco_details` ( `lockVersion`, `sid`,`createSid`, `modifySid`,
`createSid`, `modifySid`, `isEnable`, `isEnable`,`createTime`, `modifyTime`,`state`, `isDelete`, `mainSid`, `yCode`,`prodCode`,
`createTime`, `modifyTime`, `prodName`, `pfj`, `yhl`,`ddl`, `price`, `cjmc`, `lszdj`) values
`state`, `isDelete`, `mainSid`, `yCode`,
`prodCode`, `prodName`, `pfj`, `yhl`,
`ddl`, `price`, `cjmc`, `lszdj`) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
('2',UUID(),NULL,NULL,'1', ('2',UUID(),NULL,NULL,'1',#{item.createTime}, #{item.modifyTime},'1','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})
#{item.mainSid},#{item.yCode},#{item.prodCode},#{item.prodName},
#{item.pfj},#{item.yhl},#{item.ddl},#{item.price},#{item.cjmc},#{item.lszdj});
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

4
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(" ") @ApiOperation(" ")
@RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) @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(); ResultBean rb = ResultBean.fireFail();
purchaseRequisitionTobaccoDetailsService.readBrandPeriodSorXls1(file,sid); purchaseRequisitionTobaccoDetailsService.readBrandPeriodSorXls1(file,sid);
return rb; return rb.success();
} }
@ApiOperation("删除记录") @ApiOperation("删除记录")
@GetMapping("/del/{ids}") @GetMapping("/del/{ids}")

24
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){ if(rowNum>0){
Map<String,Object> sd_map=new HashMap<>(); Map<String,Object> sd_map=new HashMap<>();
try{ try{
sd_map.put("yCode",r.get(0));//卷烟代码 sd_map.put("yCode",r.get(0).toString().trim());//卷烟代码
sd_map.put("storeCode","");//商品代码 sd_map.put("prodCode","12");//商品代码
sd_map.put("prodName",r.get(1));//商品名称 sd_map.put("prodName",r.get(1).toString().trim());//商品名称
sd_map.put("pfj",r.get(2));//批发价 sd_map.put("pfj",r.get(2).toString().trim());//批发价
sd_map.put("yhl",r.get(3));//要货量 sd_map.put("yhl",r.get(3).toString().trim());//要货量
sd_map.put("ddl",r.get(4));//订单量 sd_map.put("ddl",r.get(4).toString().trim());//订单量
sd_map.put("price",r.get(5));//金额 sd_map.put("price",r.get(5).toString().trim());//金额
BigDecimal price = new BigDecimal(r.get(5).toString()); BigDecimal price = new BigDecimal(r.get(5).toString().trim());
bigDecimal= bigDecimal.add(price); bigDecimal= bigDecimal.add(price);
sd_map.put("cjmc",r.get(6));//厂家名称 sd_map.put("cjmc",r.get(6).toString().trim());//厂家名称
sd_map.put("lszdj",r.get(7));//零售指导价 sd_map.put("lszdj",r.get(7).toString().trim());//零售指导价
sd_map.put("mainSid",sid);//关联表sid sd_map.put("mainSid",sid);//关联表sid
PurchaseRequisitionTobaccoDetails sd=new PurchaseRequisitionTobaccoDetails(); PurchaseRequisitionTobaccoDetails sd=new PurchaseRequisitionTobaccoDetails();
BeanUtil.fillBeanWithMap(sd_map, sd, true); BeanUtil.fillBeanWithMap(sd_map, sd, true);
@ -160,6 +160,10 @@ public class PurchaseRequisitionTobaccoDetailsService extends MybatisBaseService
public void doAfterAllAnalysed() { public void doAfterAllAnalysed() {
List<List<PurchaseRequisitionTobaccoDetails>> listArray = new ArrayList<List<PurchaseRequisitionTobaccoDetails>>(); List<List<PurchaseRequisitionTobaccoDetails>> listArray = new ArrayList<List<PurchaseRequisitionTobaccoDetails>>();
int listSize = salesDatas.size(); int listSize = salesDatas.size();
if(listSize>0){
baseMapper.deleteByMainSid(salesDatas.get(0).getMainSid());
}
int pageSize=5000; int pageSize=5000;
for (int i = 0; i < listSize; i += pageSize) { for (int i = 0; i < listSize; i += pageSize) {
int toIndex = Math.min(i + pageSize, listSize); int toIndex = Math.min(i + pageSize, listSize);

2
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<RestrictedBrand> {
@Select("select * from restricted_brand") @Select("select * from restricted_brand")
List<RestrictedBrandVo> selectListVo(); List<RestrictedBrandVo> selectListVo();
@Select("select * from restricted_brand where code=#{brandCode}")
RestrictedBrand selectByBrands(@Param("brandCode")String brandCode);
} }

4
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<RestrictedBrandMa
System.out.println(x1); System.out.println(x1);
//return message; //return message;
} }
public RestrictedBrand selectByBrands(String brandCode) {
return baseMapper.selectByBrands(brandCode);
}
} }

4
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/restrictedcategory/RestrictedCategoryMapper.java

@ -64,8 +64,8 @@ public interface RestrictedCategoryMapper extends BaseMapper<RestrictedCategory>
List<RestrictedCategoryVo> selectListVo(); List<RestrictedCategoryVo> selectListVo();
@Select("select * from restricted_category where categorys like CONCAT('%',#{categoryKey},'%') and brands like CONCAT('%',#{brandCode},'%')") @Select("select * from restricted_category where categorys like CONCAT('%',#{categoryKey},'%') and brands like CONCAT('%',#{brandCode},'%')")
List<RestrictedCategory> limitJudgement(@Param("categoryKey")String categoryKey, @Param("brandCode")String brandCode); List<RestrictedCategory> limitJudgement(@Param("categoryKey")String categoryKey, @Param("brandCode")String brandCode);
@Select("select * from restricted_category where categorys like CONCAT('%',#{categoryKey},'%') ") @Select("select * from restricted_category where categoryKey = #{categoryKey} ")
List<RestrictedCategory> selectByCategorys(@Param("categoryKey")String categoryKey); RestrictedCategory selectByCategorys(@Param("categoryKey")String categoryKey);
@Select("select * from restricted_category where brands like CONCAT('%',#{brandCode},'%') ") @Select("select * from restricted_category where brands like CONCAT('%',#{brandCode},'%') ")
List<RestrictedCategory> selectByBrands(@Param("brandCode")String brand); List<RestrictedCategory> selectByBrands(@Param("brandCode")String brand);
} }

52
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.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService; 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.apache.poi.ss.usermodel.CellType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Project: yxt-supervise(宇信通监管) <br/> * Project: yxt-supervise(宇信通监管) <br/>
@ -70,6 +79,12 @@ import java.util.List;
@Slf4j @Slf4j
@Service @Service
public class RestrictedCategoryService extends MybatisBaseService<RestrictedCategoryMapper, RestrictedCategory> { public class RestrictedCategoryService extends MybatisBaseService<RestrictedCategoryMapper, RestrictedCategory> {
@Resource
private DictCommonService dictCommonService;
@Resource
private BrandInfoService brandInfoService;
@Resource
private RestrictedBrandService restrictedBrandService;
private QueryWrapper<RestrictedCategory> createQueryWrapper(RestrictedCategoryQuery query) { private QueryWrapper<RestrictedCategory> createQueryWrapper(RestrictedCategoryQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -146,13 +161,13 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
pr.setCategorys(value); pr.setCategorys(value);
} }
} }
if (i == 2) {//名称 /*if (i == 2) {//名称
brandIdHSSFCell.setCellType(CellType.STRING); brandIdHSSFCell.setCellType(CellType.STRING);
if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) { if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
String value = brandIdHSSFCell.getStringCellValue(); String value = brandIdHSSFCell.getStringCellValue();
pr.setBrands(value); pr.setBrands(value);
} }
} }*/
}else{ }else{
System.err.println("rowNum="+rowNum+",i="+i+",value=null"); System.err.println("rowNum="+rowNum+",i="+i+",value=null");
} }
@ -174,15 +189,32 @@ public class RestrictedCategoryService extends MybatisBaseService<RestrictedCate
//return message; //return message;
} }
public List<RestrictedCategory> limitJudgement(String categoryKey, String brandSid) { public Map<String,String> limitJudgement(String categoryKey, String brandCode) {
List<RestrictedCategory> r=baseMapper.selectByCategorys(categoryKey); Map<String,String> result=new HashMap<>();
if(r==null||r.size()==0){ RestrictedCategory r=baseMapper.selectByCategorys(categoryKey);
return new ArrayList<>(); 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<RestrictedCategory> r1=baseMapper.selectByBrands(brandSid); RestrictedBrand r1=restrictedBrandService.selectByBrands(brandCode);
if(r1==null||r1.size()==0){ if(r1==null ){
return new ArrayList<>(); 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);
} }
} }

4
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<SalesDataMapper, SalesD
System.err.println("i="+i+",value=null"); System.err.println("i="+i+",value=null");
} }
lisss.add(rowNum+""); lisss.add(rowNum+"");
//inventoryInformationService.reduceStock(sd.getProCode(),sd.getProName(),sd.getStoreCode(),sd.getSaleNum()); //inventoryInformationService.reduceStock(sd.getProCode(),sd.getProName(),sd.getStoreCode(),sd.getSaleNum());
log.info("productInformation:{}", JSONObject.toJSONString(sd_map)); log.info("productInformation:{}", JSONObject.toJSONString(sd_map));
log.info("rowNum:{}", rowNum); log.info("rowNum:{}", rowNum);
@ -366,6 +365,7 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
* @return * @return
*/ */
public HSSFWorkbook analysisSalesData(String pc,String storeCode){ public HSSFWorkbook analysisSalesData(String pc,String storeCode){
ResultBean rb=ResultBean.fireFail();
List<SalesData> list=new ArrayList<>(); List<SalesData> list=new ArrayList<>();
if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isNotBlank(storeCode)){ if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isNotBlank(storeCode)){
list=baseMapper.selectByDateAndstoreCode(pc,storeCode); list=baseMapper.selectByDateAndstoreCode(pc,storeCode);
@ -383,7 +383,7 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
for(SalesData s:list){ for(SalesData s:list){
String proCode = s.getProCode(); String proCode = s.getProCode();
//List<StoreInfo> storeInfos=storeInfoService.selectLimitStores(); //List<StoreInfo> storeInfos=storeInfoService.selectLimitStores();
List<PurchaseRequisitionPro> lps=purchaseRequisitionProService.selectByCode(proCode); List<PurchaseRequisitionPro> lps=purchaseRequisitionProService.selectValByCode(proCode);
if((lps==null||lps.size()==0)){//&&s.getCategorys().indexOf("0811")<0 烟 if((lps==null||lps.size()==0)){//&&s.getCategorys().indexOf("0811")<0 烟
continue; continue;
} }

Loading…
Cancel
Save