Merge remote-tracking branch 'origin/master'

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);
 }

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 {
 

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<FinPaymentrecord
             apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getCostTypeKey());
             apPayBill.setF_PAEZ_AssistantType("payCostType");
         } else {
-            apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getCostTypeKey());
+            if ("009".equals(finPaymentrecord.getCostTypeKey())){
+                apPayBill.setF_PAEZ_AssistantKey("001");
+            }else {
+                apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getCostTypeKey());
+            }
             apPayBill.setF_PAEZ_AssistantType("payChannel");
         }
         List<ApPayBill.FPAYBILLENTRY> FPAYBILLENTRYs = new ArrayList<>();

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<ApPayBill.FPAYBILLENTRY> fpaybillentrYs = apPayBill.getFPAYBILLENTRY();
             List<Map<String, String>> vehicleListMap = createVehicleLists(fpaybillentrYs);

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<String> skuSids = baseGoodsSkuService.fetchSkuSid(goodTypeSid);
         return rb.success().setData(skuSids);
     }
+
+    @ApiOperation("导出")
+    @PostMapping("/excelList")
+    public void excelList(@RequestParam("deptSid") String deptSid) {
+        //得到所有要导出的数据
+        List<GoodsExcelVo> 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);
+    }
 }

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;
+}

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<BaseGoodsSku> {
     List<GoodsDeptVo> selectGoods(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
 
     List<String> fetchSkuSid(String goodTypeSid);
+
+    List<GoodsExcelVo> excelList(String deptSid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@@ -7,7 +7,7 @@
     <select id="listPage" resultType="com.yxt.base.biz.base.basegoodssku.BaseGoodsSkuVo">
         select s.*, s.own_spec as ownSpec, a.goodsName
         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
         <where>
             ${ew.sqlSegment}
         </where>
@@ -26,15 +26,15 @@
     </select>
 
     <select id="getSelectList" resultType="com.yxt.base.biz.base.basegoodssku.BaseGoodsSkuSelectList">
-        select sku.sid       goodsSkuSid,
-               spu.sid   as  goodsSpuSid,
-               spu.goodsName goodsSpuName,
-               sku.goodsSkuCode,
-               sku.title as  goodsSkuTitle,
-               spu.goodsUnitSid,
-               spu.goodsUnitName
+        select sku.sid goodsSkuSid,
+        spu.sid as goodsSpuSid,
+        spu.goodsName goodsSpuName,
+        sku.goodsSkuCode,
+        sku.title as goodsSkuTitle,
+        spu.goodsUnitSid,
+        spu.goodsUnitName
         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>
             ${ew.sqlSegment}
         </where>
@@ -42,35 +42,35 @@
 
     <select id="purGoodsListPage" resultType="com.yxt.base.biz.base.basegoodssku.BaseGoodsSkuPurSelectList">
         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
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="getGoodsListPage" resultType="com.yxt.base.biz.base.basegoodssku.GoodsSkuVo">
-        select sku.sid       goodsSkuSid,
-               spu.sid as    goodsSpuSid,
-               sku.title goodsSpuName,
-               sku.goodsSkuCode,
-               sku.indexes,
-               spu.goodsUnitName,
-               spu.manufacturerSid,
-               spu.manufacturerName
+        select sku.sid goodsSkuSid,
+        spu.sid as goodsSpuSid,
+        sku.title goodsSpuName,
+        sku.goodsSkuCode,
+        sku.indexes,
+        spu.goodsUnitName,
+        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>
             ${ew.sqlSegment}
         </where>
@@ -78,16 +78,16 @@
 
     <select id="selectGoods" resultType="com.yxt.base.biz.base.basegoodssku.GoodsDeptVo">
         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}
         <if test="name != null and name != ''">
             and concat(IFNULL(sku.title
@@ -98,12 +98,34 @@
     </select>
 
     <select id="fetchSkuSid" resultType="java.lang.String">
-        SELECT
-            sku.sid
-        FROM
-            base_goods_sku sku
-                LEFT JOIN base_goods_spu spu
-                          ON sku.goodsSpuSid = spu.sid
+        SELECT sku.sid
+        FROM base_goods_sku sku
+                 LEFT JOIN base_goods_spu spu
+                           ON sku.goodsSpuSid = spu.sid
         WHERE spu.goodsTypeSid = #{goodTypeSid}
     </select>
+
+    <select id="excelList" resultType="com.yxt.base.apiadmin.base.GoodsExcelVo">
+        SELECT @row_number := @row_number + 1 AS rankNo,
+               spu.goodsName                 AS goodsSpuName,
+               sku.goodsSkuCode,
+               sku.own_spec                  AS goodsSkuOwnSpec,
+               spu.goodsUnitName             AS unit,
+               brand.brandName,
+               spu.manufacturerName,
+               t.goodsTypeName,
+               IF(t.isGoodsID = 0, '否', '是') AS isYwym
+        FROM base_goods_sku sku
+                 LEFT JOIN base_goods_spu spu
+                           ON sku.goodsSpuSid = spu.sid
+                 LEFT JOIN base_goods_type t
+                           ON spu.goodsTypeSid = t.sid
+                 LEFT JOIN base_brand_info brand
+                           ON spu.brandSid = brand.sid,
+             (
+                 SELECT @row_number := 0
+             ) AS r
+        WHERE spu.useOrgSid = #{deptSid}
+          AND spu.isDelete = 0
+    </select>
 </mapper>

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<BaseGoodsSkuMapper,
     public List<String> fetchSkuSid(String goodTypeSid) {
         return baseMapper.fetchSkuSid(goodTypeSid);
     }
+
+    public List<GoodsExcelVo> excelList(String deptSid) {
+        List<GoodsExcelVo> goodsExcelVoList = baseMapper.excelList(deptSid);
+        return goodsExcelVoList;
+    }
 }

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;
 }

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;
 }

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;
 }

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;
 }