diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java index c4b111ae..54ff8461 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java @@ -29,7 +29,12 @@ package com.yxt.supervise.portal.api.purchaserequisition; import com.yxt.common.core.vo.Vo; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; + +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -88,4 +93,6 @@ public class PurchaseRequisitionDetailsVo implements Vo { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("商品列表") + private List pros=new ArrayList<>(); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java index c814cfe6..0c0131fa 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java @@ -29,7 +29,12 @@ package com.yxt.supervise.portal.api.purchaserequisition; import com.yxt.common.core.dto.Dto; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; + +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -88,4 +93,6 @@ public class PurchaseRequisitionDto implements Dto { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("商品列表") + private List pros=new ArrayList<>(); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java index 4562275c..95952450 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java @@ -69,10 +69,10 @@ public interface PurchaseRequisitionFeign { @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); + public ResultBean delBySids(@RequestParam("sids") String sids); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java index 360c6ec8..d3ea172f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java @@ -60,12 +60,12 @@ public class PurchaseRequisitionFeignFallback implements PurchaseRequisitionFeig } @Override - public ResultBean delBySids( String[] sids){ + public ResultBean delBySids( String sids){ return ResultBean.fireFail().setMsg("接口宇信通监管/purchaserequisition/delBySids无法访问"); } @Override - public ResultBean fetchDetailsBySid(String sid){ + public ResultBean fetchDetailsBySid(String sid){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口宇信通监管/purchaserequisition/fetchDetailsBySid无法访问"); } 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 ec20c4b8..0f63ec5b 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 @@ -42,6 +42,7 @@ import com.yxt.supervise.portal.api.productinformation.ProductInformationVo; import com.yxt.supervise.portal.api.productnum.*; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; import com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategory; import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; @@ -480,7 +481,7 @@ public class ProductNumService extends MybatisBaseService list=purchaseRequisitionProService.selectByMainSid(purchaseRequisitionSid); + List list=purchaseRequisitionProService.selectByMainSid(purchaseRequisitionSid); addProductNum(purchaseRequisition,list); List productNums=baseMapper.selectByPc(pc); @@ -537,12 +538,12 @@ public class ProductNumService extends MybatisBaseService list) { + private void addProductNum(PurchaseRequisition pu,List list) { Map map=new HashMap(); map.put("pc",pu.getCode()); baseMapper.deleteByMap(map); for(int i = 0; i < list.size(); i++){ - PurchaseRequisitionPro p=list.get(i); + PurchaseRequisitionProDto p=list.get(i); ProductNum pr=new ProductNum(); pr.setPc(pu.getCode()); pr.setSupplierCode(pu.getSupplierCode());//供应商代码 diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java index f1923597..031db6bf 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -1,8 +1,17 @@ package com.yxt.supervise.portal.biz.purchaserequisition; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.portal.api.productinformation.ProductInformation; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; +import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionDetailsVo; +import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionVo; +import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfo; +import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfoVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -39,4 +48,13 @@ public interface PurchaseRequisitionMapper extends BaseMapper> list); void insertGysddmxb(List> list2); + @Delete(" DELETE FROM hz_gysddmxb") + void deleteGysddmxb(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + int delBySids(@Param("list") String[] split); + @Select("select * from purchase_requisition where sid=#{sid}") + PurchaseRequisitionDetailsVo fetchDetailsBySid(@Param("sid")String sid); + @Select("select * from purchase_requisition where sid=#{sid}") + PurchaseRequisition selectBySid(String sid); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml index f6b0e73b..a47d53a1 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml @@ -33,4 +33,14 @@ ) + + delete from purchase_requisition where sid in + + #{item} + + + + \ No newline at end of file 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 c968f125..5c27c905 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 @@ -1,13 +1,22 @@ package com.yxt.supervise.portal.biz.purchaserequisition; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.purchaserequisition.*; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; +import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfoFeign; +import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfoQuery; +import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfoVo; +import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService; +import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionProService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -17,13 +26,21 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.text.ParseException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; @Api(tags = "采购订单基本信息") @RestController("com.supervise.biz.purchaserequisition.PurchaseRequisitionRest") @RequestMapping("v1/purchaserequisition") -public class PurchaseRequisitionRest { +@Slf4j +public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { @Resource private PurchaseRequisitionService purchaseRequisitionService; + @Resource + private PurchaseRequisitionProService purchaseRequisitionProService; + @ApiOperation(" ") @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, @@ -61,5 +78,53 @@ public class PurchaseRequisitionRest { return rb; } + @ApiOperation("") + @RequestMapping(value = "/resetCache", method = RequestMethod.POST) + public ResultBean resetCache(){ + log.info("resetCache:{}","/resetCache"); + GdRescategoryProdService.resetCache(); + ResultBean rb = ResultBean.fireFail(); + return rb; + } + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseRequisitionService.listPageVo(pq); + return rb.success().setData(pv); + } + @Override + public ResultBean save(PurchaseRequisitionDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + PurchaseRequisition purchaseRequisition = purchaseRequisitionService.selectBySid(sid); + BeanUtil.copyProperties(dto,purchaseRequisition); + purchaseRequisitionService.updateById(purchaseRequisition); + List pros = dto.getPros(); + String [] sidArr={sid}; + purchaseRequisitionProService.delByMainSids(sidArr); + for(PurchaseRequisitionProDto p:pros){ + PurchaseRequisitionPro purchaseRequisitionPro = new PurchaseRequisitionPro(); + BeanUtil.copyProperties(p,purchaseRequisitionPro); + purchaseRequisitionPro.setMainSid(sid); + purchaseRequisitionPro.setSid(UUID.randomUUID().toString()); + purchaseRequisitionProService.insert(purchaseRequisitionPro); + } + return rb.success().setMsg("操作成功"); + } + + @Override + public ResultBean delBySids(String sids) { + return purchaseRequisitionService.delBySids(sids); + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean resultBean = ResultBean.fireFail(); + PurchaseRequisitionDetailsVo vo=purchaseRequisitionService.fetchDetailsBySid(sid); + List purchaseRequisitionPros = purchaseRequisitionProService.selectByMainSid(sid); + vo.setPros(purchaseRequisitionPros); + return resultBean.success().setData(vo); + } } 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 2b822965..972cb5d0 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 @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.portal.api.brandinfo.BrandInfo; import com.yxt.supervise.portal.api.brandinfo.BrandInfoVo; @@ -18,23 +19,21 @@ import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfo; import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfoVo; import com.yxt.supervise.portal.api.productinformation.*; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; +import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionDetailsVo; +import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionQuery; +import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionVo; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; import com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategory; -import com.yxt.supervise.portal.api.supplierinfo.SupplierInfo; -import com.yxt.supervise.portal.api.supplierinfo.SupplierInfoVo; import com.yxt.supervise.portal.api.warehouseposition.WarehousePosition; import com.yxt.supervise.portal.api.warehouseposition.WarehousePositionVo; -import com.yxt.supervise.portal.api.warehouseshelves.WarehouseShelves; -import com.yxt.supervise.portal.api.warehouseshelves.WarehouseShelvesVo; -import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; +import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService; import com.yxt.supervise.portal.biz.manufacturerinfo.ManufacturerInfoService; import com.yxt.supervise.portal.biz.productinformation.ProductInformationService; import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionProService; import com.yxt.supervise.portal.biz.restrictedcategory.RestrictedCategoryService; import com.yxt.supervise.portal.biz.supplierinfo.SupplierInfoService; import com.yxt.supervise.portal.biz.warehouseposition.WarehousePositionService; -import com.yxt.supervise.portal.biz.warehouseshelves.WarehouseShelvesService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -71,6 +70,21 @@ public class PurchaseRequisitionService extends MybatisBaseService createQueryWrapper(PurchaseRequisitionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PurchaseRequisitionQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } public void supplierAnalysis( ) throws ParseException { ztspglhzb(); gysddmxb(); @@ -93,11 +107,11 @@ public class PurchaseRequisitionService extends MybatisBaseServicenowMillisecond&&subtract.compareTo(new BigDecimal("0"))==1){//是否延期 大于到货日期 并且在途货值大于0 为延期 + long arrivalMillisecond = parse.getTime();//到货日期 + if(nowMillisecond>arrivalMillisecond&&subtract.compareTo(new BigDecimal("0"))==1){//是否延期 大于到货日期 并且在途货值大于0 为延期 m.put("sfyq","是"); }else{ m.put("sfyq","否"); @@ -130,6 +144,7 @@ public class PurchaseRequisitionService extends MybatisBaseService resultBean = ResultBean.fireFail(); + String[] split = sids.split(","); + int i= baseMapper.delBySids(split); + int ii=purchaseRequisitionProService.delByMainSids(split); + return resultBean.success().setData("1"); + } + + public PurchaseRequisitionDetailsVo fetchDetailsBySid(String sid) { + PurchaseRequisitionDetailsVo p = baseMapper.fetchDetailsBySid(sid); + return p; + } + + public PurchaseRequisition selectBySid(String sid) { + return baseMapper.selectBySid(sid); + } } 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 b70ee3c3..522a9031 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 @@ -2,10 +2,8 @@ package com.yxt.supervise.portal.biz.purchaserequisitionpro; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; +import org.apache.ibatis.annotations.*; import java.util.List; import java.util.Map; @@ -18,7 +16,7 @@ public interface PurchaseRequisitionProMapper extends BaseMapper selectByMainSid(@Param("mainSid") String purchaseRequisitionSid); + List selectByMainSid(@Param("mainSid") String purchaseRequisitionSid); @Select("select * from purchase_requisition_pro where proCode=#{proCode}") List selectByCode(@Param("proCode")String proCode); @Select("select * from purchase_requisition_pro ") @@ -38,4 +36,10 @@ public interface PurchaseRequisitionProMapper extends BaseMapper> purchaseRequisitionPros); + @Select("select count(1) from gd_rescategory_prod where prodCode='#{proCode}'") + int selectProdCodeTable(@Param("proCode") String proCode); +@Insert("insert into gd_rescategory_prod(prodCode) values('#{proCode}')") + int insertProdCodeTable(@Param("proCode")String proCode); + + int delByMainSids(@Param("list") String[] split); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.xml index 041d2a6b..0e4d4282 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.xml @@ -34,5 +34,11 @@ #{item.arrivalDate,jdbcType=VARCHAR}) + + delete from purchase_requisition_pro where mainsid in + + #{item} + + \ No newline at end of file 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 6631be3e..44bae671 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 @@ -2,6 +2,7 @@ package com.yxt.supervise.portal.biz.purchaserequisitionpro; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; import org.springframework.stereotype.Service; import java.util.List; @@ -14,7 +15,7 @@ public class PurchaseRequisitionProService extends MybatisBaseService selectByMainSid(String purchaseRequisitionSid) { + public List selectByMainSid(String purchaseRequisitionSid) { return baseMapper.selectByMainSid(purchaseRequisitionSid); } @@ -53,4 +54,15 @@ public class PurchaseRequisitionProService extends MybatisBaseService> purchaseRequisitionPros) { baseMapper.addSupplierAndpurAnalysis(purchaseRequisitionPros); } + + public int selectProdCodeTable(String proCode) { + return baseMapper.selectProdCodeTable(proCode); + } + public int insertProdCodeTable(String proCode) { + return baseMapper.insertProdCodeTable(proCode); + } + + public int delByMainSids(String[] split) { + return baseMapper.delByMainSids(split); + } } 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 7fa25eb1..737ff523 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 @@ -26,11 +26,8 @@ package com.yxt.supervise.portal.biz.salesdata; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.sax.handler.RowHandler; -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; @@ -40,24 +37,18 @@ import com.yxt.supervise.portal.api.brandinfo.BrandInfo; import com.yxt.supervise.portal.api.brandinfo.BrandInfoVo; import com.yxt.supervise.portal.api.dictcommon.DictCommon; import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; -import com.yxt.supervise.portal.api.productinformation.ProductInformationVo; -import com.yxt.supervise.portal.api.productnum.ProductNum; -import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; -import com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategory; import com.yxt.supervise.portal.api.storeinfo.StoreInfo; import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; -import com.yxt.supervise.portal.biz.gdinventory.GdInventoryLog; -import com.yxt.supervise.portal.biz.gdinventory.GdInventoryLogErr; -import com.yxt.supervise.portal.biz.gdinventory.GdInventoryOk; +import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageGd; +import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageGdService; import com.yxt.supervise.portal.biz.inventoryinformation.InventoryInformationService; import com.yxt.supervise.portal.biz.productinformation.ProductInformationService; import com.yxt.supervise.portal.biz.purchaserequisition.PurchaseRequisitionService; import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionProService; import com.yxt.supervise.portal.biz.restrictedcategory.RestrictedCategoryService; import com.yxt.supervise.portal.biz.storeinfo.StoreInfoService; -import com.yxt.supervise.portal.extexcel.ExcelTool; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -70,11 +61,9 @@ import com.yxt.supervise.portal.api.salesdata.SalesDataQuery; import com.yxt.supervise.portal.api.salesdata.SalesDataVo; import com.yxt.supervise.portal.api.salesdata.SalesDataDetailsVo; import com.yxt.supervise.portal.api.salesdata.SalesDataDto; -import com.yxt.supervise.portal.api.salesdata.SalesDataFeign; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.beans.factory.annotation.Autowired; @@ -82,8 +71,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.io.IOException; -import java.io.InputStream; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -370,8 +357,8 @@ 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)){ + if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isNotBlank(storeCode)){ list=baseMapper.selectByDateAndstoreCode(pc,storeCode); }else if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isBlank(storeCode)){ list=baseMapper.selectByDate(pc); @@ -425,6 +412,29 @@ public class SalesDataService extends MybatisBaseService gdInstorageGds = gdInstorageGdService.jmdRkmxdOfDay(pc); + List> listss2=new ArrayList<>(); + for(int j=0;j map=new HashMap<>(); + map.put("t1",gdInstorageGd.getColc2());//门店 + String colc2 = gdInstorageGd.getColc2(); + String[] split = colc2.split("]"); + map.put("t2",split[1]); + map.put("t3",gdInstorageGd.getColg6());//统配出 + map.put("t4","无");// 销售订单编号 + map.put("t5",gdInstorageGd.getColh7());//商品编码 + map.put("t6",gdInstorageGd.getColi8());//商品名称 + map.put("t7",gdInstorageGd.getColr17());//数量 + map.put("t8","无"); + map.put("t9",gdInstorageGd.getColq16());//入库金额 + map.put("t10",list.get(0).getDataDate()); + listss2.add(map); + } + baseMapper.insertsalestest(listss2); + log.info("结束新增jmdRkmxdOfDay"); + //double d=gdInstorageGdService.jmdRkmxdValOfDay(pc); return null; } public HSSFWorkbook analysisSalesData2(String pc,String storeCode){