diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 1e27768d50..0df7e716c3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -547,5 +547,5 @@ public interface BaseVehicleFeign { @ApiOperation("根据车辆sid修改买断状态为预买断") @PostMapping("/updateVehicleYmd") @ResponseBody - ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue); + ResultBean updateVehicleYmd(@RequestParam("vehiSid") String vehiSid,@RequestParam("settlementStatus") String settlementStatus,@RequestParam("settlementStatusValue") String settlementStatusValue); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java index 4f4ff5cfcf..1b7811a618 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java @@ -53,7 +53,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; }) //@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.fin", // "com.yxt.anrui.portal", "com.yxt.anrui.buscenter", -// "com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm","com.yxt.anrui.riskcenter",}) +// "com.yxt.anrui.base", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.scm","com.yxt.anrui.riskcenter"}) @EnableFeignClients(basePackages = {"com.yxt.*"}) public class AnruiFinApplication { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 7ac5e97060..51d9a1971e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -661,7 +661,11 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java index de4c3b8631..678e34b9e9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java @@ -34,7 +34,9 @@ public class ApPayBillService extends FinKingDeeService { if(!success){ return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); } - map_fEntityModel_.put("F_PAEZ_Assistant",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"001"); + if (sysMappingInfoVoResultBean.getData() != null){ + map_fEntityModel_.put("F_PAEZ_Assistant",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"001"); + } //准备 物料列表的数据 ForEntryBill List fpaybillentrYs = apPayBill.getFPAYBILLENTRY(); List> vehicleListMap = createVehicleLists(fpaybillentrYs); diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java index 6310c0a22f..7e23fac38f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java @@ -1,6 +1,7 @@ package com.yxt.base.apiadmin.base; import com.yxt.base.biz.base.basegoodssku.*; +import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -9,6 +10,9 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.List; /** @@ -19,8 +23,11 @@ import java.util.List; @RestController @RequestMapping("/apiadmin/base/basegoodssku") public class BaseGoodsSkuRest { + @Autowired BaseGoodsSkuService baseGoodsSkuService; + @Autowired + HttpServletResponse response; @ApiOperation("分页列表") @PostMapping("/listPage") @@ -95,4 +102,20 @@ public class BaseGoodsSkuRest { List skuSids = baseGoodsSkuService.fetchSkuSid(goodTypeSid); return rb.success().setData(skuSids); } + + @ApiOperation("导出") + @PostMapping("/excelList") + public void excelList(@RequestParam("deptSid") String deptSid) { + //得到所有要导出的数据 + List exportVoList = baseGoodsSkuService.excelList(deptSid); + //定义导出的excel名字 + String excelName = "期初上架"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, exportVoList, GoodsExcelVo.class, response); + } } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/GoodsExcelVo.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/GoodsExcelVo.java new file mode 100644 index 0000000000..7a6202cbe4 --- /dev/null +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/GoodsExcelVo.java @@ -0,0 +1,40 @@ +package com.yxt.base.apiadmin.base; + +import com.yxt.common.core.utils.ExportEntityMap; +import lombok.Data; +import java.math.BigDecimal; + +@Data +public class GoodsExcelVo { + + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName") + private String goodsSpuName; + @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode") + private String goodsSkuCode; + @ExportEntityMap(CnName = "规格型号", EnName = "goodsSkuOwnSpec") + private String goodsSkuOwnSpec; + @ExportEntityMap(CnName = "单位", EnName = "unit") + private String unit; + @ExportEntityMap(CnName = "数量", EnName = "num") + private BigDecimal num; + @ExportEntityMap(CnName = "品牌", EnName = "brandName") + private String brandName; + @ExportEntityMap(CnName = "厂家", EnName = "manufacturerName") + private String manufacturerName; + @ExportEntityMap(CnName = "供应商", EnName = "supplierName") + private String supplierName; + @ExportEntityMap(CnName = "销售指导价", EnName = "saleGuidePrice") + private String saleGuidePrice; + @ExportEntityMap(CnName = "入库单价", EnName = "inCost") + private String inCost; + @ExportEntityMap(CnName = "税率", EnName = "taxRate") + private String taxRate; + @ExportEntityMap(CnName = "首次入库日期", EnName = "firstInDate") + private String firstInDate; + @ExportEntityMap(CnName = "商品类别", EnName = "goodsTypeName") + private String goodsTypeName; + @ExportEntityMap(CnName = "是否为一物一码", EnName = "isYwym") + private String isYwym; +} diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java index dd688eac58..1d4507c579 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java @@ -4,6 +4,7 @@ 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.base.apiadmin.base.GoodsExcelVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -31,4 +32,6 @@ public interface BaseGoodsSkuMapper extends BaseMapper { List selectGoods(@Param("name") String name, @Param("useOrgSid") String useOrgSid); List fetchSkuSid(String goodTypeSid); + + List excelList(String deptSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml index d764835a0a..117a386d9a 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml @@ -7,7 +7,7 @@ SELECT s.sid, - s.goodsSkuCode, - s.title, - s.own_spec AS ownSpec, - a.goodsName, - a.goodsPY, - a.goodsShortName, - a.goodsTypeSid, - a.brandSid, - a.manufacturerSid, - a.goodsUnitName + s.goodsSkuCode, + s.title, + s.own_spec AS ownSpec, + a.goodsName, + a.goodsPY, + a.goodsShortName, + a.goodsTypeSid, + a.brandSid, + a.manufacturerSid, + a.goodsUnitName FROM base_goods_sku s - LEFT JOIN base_goods_spu a - ON a.sid = s.goodsSpuSid + LEFT JOIN base_goods_spu a + ON a.sid = s.goodsSpuSid ${ew.sqlSegment} select spu.sid AS goodsSpuSid, - spu.goodsName AS goodsSpuName, - sku.sid AS goodsSkuSid, - sku.title AS goodsSkuTitle, - sku.goodsSkuCode, - spu.goodsUnitName AS unit, - sku.indexes AS goodsSkuOwnSpec, - spu.manufacturerSid, - spu.manufacturerName + spu.goodsName AS goodsSpuName, + sku.sid AS goodsSkuSid, + sku.title AS goodsSkuTitle, + sku.goodsSkuCode, + spu.goodsUnitName AS unit, + sku.indexes AS goodsSkuOwnSpec, + spu.manufacturerSid, + spu.manufacturerName from base_goods_sku sku - left join base_goods_spu spu on spu.sid = sku.goodsSpuSid + left join base_goods_spu spu on spu.sid = sku.goodsSpuSid where spu.useOrgSid = #{useOrgSid} and concat(IFNULL(sku.title @@ -98,12 +98,34 @@ + + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java index da67297c3d..fbf9fc62c6 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.base.apiadmin.base.GoodsExcelVo; import com.yxt.base.biz.base.basegoodsskuextend.BaseGoodsSkuExtendVo; import com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpu; import com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpuService; @@ -268,4 +269,9 @@ public class BaseGoodsSkuService extends MybatisBaseService fetchSkuSid(String goodTypeSid) { return baseMapper.fetchSkuSid(goodTypeSid); } + + public List excelList(String deptSid) { + List goodsExcelVoList = baseMapper.excelList(deptSid); + return goodsExcelVoList; + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java index b07a0d228e..7bfa2c421f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java @@ -87,8 +87,8 @@ public class WmsInitialDetail extends BaseEntity { private String goodsTypeName; // 商品类别名称 @ApiModelProperty("已上架数量") private BigDecimal listNum; // 已上架数量 - @ApiModelProperty("是否为一物一码(0是，1否)") - private Integer isYwym; // 是否为一物一码(0是，1否) - @ApiModelProperty("是否已上传商品标签(0是，1否)") + @ApiModelProperty("是否为一物一码") + private Integer isYwym; + @ApiModelProperty("是否已上传商品标签") private Integer isScbq; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java index bad45146d3..2668d5ab16 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java @@ -86,8 +86,8 @@ public class WmsInitialDetailDetailsVo implements Vo { private String goodsTypeName; // 商品类别名称 @ApiModelProperty("已上架数量") private BigDecimal listNum; // 已上架数量 - @ApiModelProperty("是否为一物一码(0是，1否)") - private Integer isYwym; // 是否为一物一码(0是，1否) - @ApiModelProperty("是否已上传商品标签(0是，1否)") + @ApiModelProperty("是否为一物一码") + private Integer isYwym; + @ApiModelProperty("是否已上传商品标签") private Integer isScbq; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java index 43efd1d962..e9c8900632 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java @@ -88,8 +88,8 @@ public class WmsInitialDetailDto implements Dto { private String goodsTypeName; // 商品类别名称 @ApiModelProperty("已上架数量") private BigDecimal listNum; // 已上架数量 - @ApiModelProperty("是否为一物一码(0是，1否)") - private Integer isYwym; // 是否为一物一码(0是，1否) - @ApiModelProperty("是否已上传商品标签(0是，1否)") + @ApiModelProperty("是否为一物一码") + private Integer isYwym; + @ApiModelProperty("是否已上传商品标签") private Integer isScbq; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java index 04cb8156d4..2f9e7baa81 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java @@ -68,8 +68,8 @@ public class WmsInitialDetailVo implements Vo { private String goodsTypeName; @ApiModelProperty("已上架数量") private BigDecimal listNum; - @ApiModelProperty("是否为一物一码(0是，1否)") + @ApiModelProperty("是否为一物一码") private Integer isYwym; - @ApiModelProperty("是否已上传商品标签(0是，1否)") + @ApiModelProperty("是否已上传商品标签") private Integer isScbq; }