Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/Common/Upload.js

@@ -1,4 +1,4 @@
 import request from '@/utils/request'
 // 上传图片
 
-export const uploadFile = '/api/riskcenter/file/upload'
+export const uploadFile = '/api/portal/file/upload'

yxt-as-ui/src/api/goods/unit.js

@@ -46,7 +46,7 @@ export default {
   // 初始化
   initUnits: function(data) {
     return request({
-      url: '/base/basegoodsunit/initialization/' + data,
+      url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data,
       method: 'get'
     });
   },

yxt-as-ui/src/views/goods/brands/brandsAdd.vue

@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>商品信息</div>
+      <div>品牌信息</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
@@ -54,11 +54,11 @@
         </div> -->
         <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
           <span class="item_text">品牌Logo：</span>
-      <!--    <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
+          <!--    <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
             bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
             -->
-            <upload-img ref="uploadImg" class="item_input" v-model="formobj.image" :limit="50" bucket="map"
-              :upload-data="{ type: '0001' }" />
+          <upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
+            :upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }"  @change="backData" />
 
         </div>
 
@@ -98,8 +98,8 @@
       // this.initData()
     },
     methods: {
-      backData(value) {
-        console.log('backData》》》》', value)
+
+      backData(value){
         console.log('imgList', this.imgList)
 
         if (this.imgList.length > 0) {
@@ -107,25 +107,13 @@
         } else {
           this.formobj.image = ''
         }
-
         this.hideUploadBtn = this.imgList.length != 0
         console.log('this.hideUploadBtn', this.hideUploadBtn)
       },
-      backData2(value) {
-        console.log('backData2》》》》', value)
-        console.log('imgList2', this.imgList2)
-
-        if (this.imgList2.length > 0) {
-          this.formobj.bigPic = this.imgList2[0].url
-        } else {
-          this.formobj.bigPic = ''
-        }
 
-        this.hideUploadBtn2 = this.imgList2.length != 0
-        console.log('this.hideUploadBtn2', this.hideUploadBtn2)
-      },
       saveOrUpdate() {
         console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
         req.saveBrands(this.formobj)
           .then(resp => {
             if (resp.success) {
@@ -144,9 +132,7 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.imgList = []
-        this.imgList2 = []
         this.hideUploadBtn = true
-        this.hideUploadBtn2 = true
         this.formobj = {
           sid: '',
           brandName: '',
@@ -159,9 +145,7 @@
       },
       showAdd() {
         console.log("this.imgList", this.imgList)
-        console.log("this.imgList2", this.imgList2)
         this.hideUploadBtn = this.imgList.length != 0
-        this.hideUploadBtn2 = this.imgList2.length != 0
       },
       showEdit(row) {
         req.initBrands(row.sid)
@@ -169,26 +153,18 @@
             if (resp.success) {
               this.formobj = resp.data
               this.imgList = []
-              this.imgList2 = []
               if (resp.data.image != '') {
                 this.imgList.push({
                   url: resp.data.image
                 })
               }
-              if (resp.data.bigPic != '') {
-                this.imgList2.push({
-                  url: resp.data.bigPic
-                })
-              }
 
               this.hideUploadBtn = this.imgList.length != 0
-              this.hideUploadBtn2 = this.imgList2.length != 0
             }
           })
           .catch(e => {
             this.formobj = row
             this.imgList = []
-            this.imgList2 = []
           })
       },
 

yxt-as-ui/src/views/goods/goods/index.vue

@@ -67,7 +67,7 @@
     <!-- 新增修改部分组件 -->
     <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     <!-- 详情部分组件 -->
-    <divInfo v-show="viewState == 4" ref="divinfo" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
 
   </div>
 </template>
@@ -230,8 +230,8 @@
         this.$router.go(-1)
       },
       toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
       },
       toRelevancyInfo(row) {
         const tip = '请确认是否删除所选品牌?'

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java

@@ -0,0 +1,51 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBill extends BaseEntity {
+    private static final long serialVersionUID = 658254140218350561L;
+
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+    @ApiModelProperty("上报日期")
+    private String reportDate;
+    @ApiModelProperty("维修工单sid")
+    private String repairBillSid;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("工时费")
+    private BigDecimal hourAmount;
+    @ApiModelProperty("材料费")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherAmount;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private BigDecimal claimGoodsAmount;
+    @ApiModelProperty("索赔外出费")
+    private BigDecimal claimOutAmount;
+    @ApiModelProperty("索赔厂家补助")
+    private BigDecimal claimSubsidyAmount;
+    @ApiModelProperty("索赔其他费用")
+    private BigDecimal claimOtherAmount;
+    @ApiModelProperty("开票状态")
+    private Integer invoiceState;
+    @ApiModelProperty("开票时间")
+    private Date invoiceTime;
+    @ApiModelProperty("回款时间")
+    private Date returnAmountTime;
+    @ApiModelProperty("调整状态")
+    private Integer adjustState;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillDto {
+
+    @ApiModelProperty("维修工单sid")
+    private String repairBillSid;
+    @ApiModelProperty("维修工单编号")
+    private String repairBillNo;
+    @ApiModelProperty("厂家索赔号")
+    private String billNo;
+
+    private String createBySid;
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillQuery implements Query {
+    private static final long serialVersionUID = 2257942964066440023L;
+
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+
+    @ApiModelProperty("单据状态")
+    private String state;
+
+    @ApiModelProperty("开票状态")
+    private String invoiceState;
+
+    @ApiModelProperty("应收调整状态")
+    private String adjustState;
+
+    private String createBySid;
+    private String orgPath;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillVo {
+    private String sid;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehmark;
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+    @ApiModelProperty("更新时间")
+    private String modifyTime;
+    @ApiModelProperty("索赔工时费")
+    private String claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("索赔其他费用")
+    private String claimOtherAmount;
+    @ApiModelProperty("单据状态")
+    private String state;
+    @ApiModelProperty("开票状态")
+    private String invoiceState;
+    @ApiModelProperty("应收调整状态")
+    private String adjustState;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBill extends BaseEntity {
+    private static final long serialVersionUID = 710287793128613158L;
+    private String billNo;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("开票sid")
+    private String invoiceSid;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private BigDecimal invoiceMoney;
+    @ApiModelProperty("附件")
+    private String file;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("组织全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDto {
+    private String sid;
+    private String createBySid;
+    private String createByName;
+    private String orgPath;
+
+    private String createTime;
+
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("开票sid")
+    private String invoiceSid;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+
+    private List<String> fileList = new ArrayList<>();
+    private String remarks;
+
+    private List<AsBusclaimInvoiceBillDetailDto> detailList = new ArrayList<>();
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillQuery implements Query {
+    private static final long serialVersionUID = 4545269610778397290L;
+
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("申请日期开始时间")
+    private String createTimeStart;
+    @ApiModelProperty("申请日期结束时间")
+    private String createTimeEnd;
+    @ApiModelProperty("办结日期开始时间")
+    private String closeDateStart;
+    @ApiModelProperty("办结日期结束时间")
+    private String closeDateEnd;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+
+    private String createBySid;
+    private String orgPath;
+
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java

@@ -0,0 +1,39 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillVo {
+
+    //sid
+    private String sid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("申请日期")
+    private String createTime;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebilldetail;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDetail extends BaseEntity {
+    private static final long serialVersionUID = -9031944826444643101L;
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车牌号")
+    private String vehmark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助费")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String claimOtherAmount;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebilldetail;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDetailDto {
+
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车牌号")
+    private String vehmark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助费")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String claimOtherAmount;
+
+    private String remarks;
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.biz.asbusclaimbill;
+
+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.anrui.as.api.asbusclaimbill.AsBusclaimBill;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Mapper
+public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
+    IPage<AsBusclaimBillVo> listPage(IPage<AsBusclaimBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimBill> qw);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillMapper">
+    <select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo">
+        select a.sid,
+               a.repairBillNo,
+               a.billNo,
+               DATE_FORMAT(a.modifyTime, '%Y-%m-%d') as modifyTime,
+               a.claimHourAmount,
+               a.claimGoodsAmount,
+               a.claimOutAmount,
+               a.claimSubsidyAmount,
+               a.claimOtherAmount,
+               a.state,
+               a.invoiceState,
+               a.adjustState
+        from as_busclaim_bill a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.as.biz.asbusclaimbill;
+
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@RestController
+@RequestMapping("v1/AsBusclaimBill")
+public class AsBusclaimBillRest {
+
+    @Autowired
+    private AsBusclaimBillService asBusclaimBillService;
+
+    @PostMapping("/save")
+    @ApiOperation("维护厂家索赔单号")
+    ResultBean save(@RequestBody AsBusclaimBillDto dto) {
+        return asBusclaimBillService.saveBill(dto);
+    }
+
+    @PostMapping("/listPage")
+    @ApiOperation("厂家索赔单分页列表")
+    ResultBean<PagerVo<AsBusclaimBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimBillQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusclaimBillVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusclaimBillVo> pv = asBusclaimBillService.listPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java

@@ -0,0 +1,67 @@
+package com.yxt.anrui.as.biz.asbusclaimbill;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Service
+public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapper, AsBusclaimBill> {
+    public ResultBean saveBill(AsBusclaimBillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        AsBusclaimBill asBusclaimBill = new AsBusclaimBill();
+        BeanUtil.copyProperties(dto, asBusclaimBill, "sid");
+        asBusclaimBill.setReportDate(DateUtil.today());
+        baseMapper.insert(asBusclaimBill);
+        return rb.success();
+    }
+
+    public PagerVo<AsBusclaimBillVo> listPage(PagerQuery<AsBusclaimBillQuery> pagerQuery) {
+        AsBusclaimBillQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusclaimBill> qw = new QueryWrapper<>();
+        //ToDo:添加查询条件
+        //索赔单号
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("a.billNo", query.getBillNo());
+        }
+        //维修工单号
+        if (StringUtils.isNotBlank(query.getRepairBillNo())) {
+            qw.like("a.repairBillNo", query.getRepairBillNo());
+        }
+        //单据状态
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.like("a.state", query.getState());
+        }
+        //开票状态
+        if (StringUtils.isNotBlank(query.getInvoiceState())) {
+            qw.like("a.invoiceState", query.getInvoiceState());
+        }
+        //应收调整状态
+        if (StringUtils.isNotBlank(query.getAdjustState())) {
+            qw.like("a.adjustState", query.getAdjustState());
+        }
+        IPage<AsBusclaimBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusclaimBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<AsBusclaimBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
+
+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.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Mapper
+public interface AsBusclaimInvoiceBillMapper extends BaseMapper<AsBusclaimInvoiceBill> {
+    IPage<AsBusclaimInvoiceBillVo> listPage(IPage<AsBusclaimInvoiceBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimInvoiceBill> qw);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusclaiminvoicebill.AsBusclaimInvoiceBillMapper">
+    <select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo">
+        select a.sid,
+               a.nodeState,
+               a.billNo,
+               a.useOrgName,
+               a.createDeptName,
+               a.createByName,
+               DATE_FORMAT(a.createTime, '%Y-%m-%d') as createTime,
+               a.closeDate,
+               a.invoiceName,
+               a.invoiceValue,
+               a.invoiceMoney
+        from as_busclaim_invoice_bill a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
+
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@RestController
+@RequestMapping("v1/AsBusclaimInvoiceBill")
+public class AsBusclaimInvoiceBillRest {
+
+    @Autowired
+    private AsBusclaimInvoiceBillService asBusclaimInvoiceBillService;
+
+    @PostMapping("/listPage")
+    @ApiOperation("厂家索赔开票分页")
+    ResultBean<PagerVo<AsBusclaimInvoiceBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusclaimInvoiceBillVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusclaimInvoiceBillVo> pv = asBusclaimInvoiceBillService.listPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/saveOrUpdateBill")
+    @ApiOperation("厂家索赔开票新增修改保存")
+    ResultBean<String> saveOrUpdateBill(@RequestBody AsBusclaimInvoiceBillDto dto) {
+        return asBusclaimInvoiceBillService.saveOrUpdateBill(dto);
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -0,0 +1,104 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
+import com.yxt.common.base.config.component.FileUploadComponent;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Service
+public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimInvoiceBillMapper, AsBusclaimInvoiceBill> {
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
+        AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>();
+        //ToDo:添加查询条件
+        //分公司
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("a.useOrgName", query.getUseOrgName());
+        }
+        //申请部门
+        if (StringUtils.isNotBlank(query.getCreateDeptName())) {
+            qw.like("a.createDeptName", query.getCreateDeptName());
+        }
+        //申请人
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("a.createByName", query.getCreateByName());
+        }
+        //单据编号
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("a.billNo", query.getBillNo());
+        }
+        //申请日期开始时间-申请日期结束时间
+        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
+                );
+        //办结日期开始时间-办结日期结束时间
+        qw.apply(StringUtils.isNotBlank(query.getCloseDateStart()), "date_format (a.closeDate,'%Y-%m-%d') >= date_format('" + query.getCloseDateStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCloseDateEnd()), "date_format (a.closeDate,'%Y-%m-%d') <= date_format('" + query.getCloseDateEnd() + "','%Y-%m-%d')"
+                );
+        //开票名称
+        if (StringUtils.isNotBlank(query.getInvoiceName())) {
+            qw.like("a.invoiceName", query.getInvoiceName());
+        }
+        //开票类型
+        if (StringUtils.isNotBlank(query.getInvoiceKey())) {
+            qw.eq("a.invoiceKey", query.getInvoiceKey());
+        }
+
+        IPage<AsBusclaimInvoiceBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusclaimInvoiceBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<AsBusclaimInvoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<String> saveOrUpdateBill(AsBusclaimInvoiceBillDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        if (StringUtils.isBlank(sid)) {
+            AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
+            BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
+            asBusclaimInvoiceBill.setOrgSidPath(dto.getOrgPath());
+            asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
+            sid = asBusclaimInvoiceBill.getSid();
+            List<String> fileList = dto.getFileList();
+            fileList.removeAll(Collections.singleton(null));
+            if (!fileList.isEmpty()) {
+                String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                asBusclaimInvoiceBill.setFile(files);
+            }
+            List<AsBusclaimInvoiceBillDetailDto> detailList = dto.getDetailList();
+            detailList.removeAll(Collections.singleton(null));
+            if (!detailList.isEmpty()) {
+
+            }
+
+        } else {
+
+        }
+        return null;
+    }
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Mapper
+public interface AsBusclaimInvoiceBillDetailMapper extends BaseMapper<AsBusclaimInvoiceBillDetail> {
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailMapper">
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@RestController
+@RequestMapping("v1/AsBusclaimInvoiceBillDetail")
+public class AsBusclaimInvoiceBillDetailRest {
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
+
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Service
+public class AsBusclaimInvoiceBillDetailService extends MybatisBaseService<AsBusclaimInvoiceBillDetailMapper, AsBusclaimInvoiceBillDetail> {
+}

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java

@@ -70,7 +70,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
             wmsGoodsBrand.setModifyTime(new Date());
             baseMapper.updateById(wmsGoodsBrand);
         } else {
-            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name",dto.getBrandName()));
+            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("brandName",dto.getBrandName()));
             if(null!=goods){
                 return rb.setMsg("商品名不能重复");
             }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java

@@ -72,20 +72,17 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
             BaseGoodsSkuExtend wmsGoods = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setModifyTime(new Date());
+            wmsGoods.setPicUrl("");
             for (UrlsVo url : dto.getUrls()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
                 }
             }
-            if (StringUtils.isNotBlank(dto.getPicUrl())) {
-                String urlPrefix = fileUploadComponent.getUrlPrefix();
-                String path = dto.getPicUrl().substring(urlPrefix.length());
-                wmsGoods.setPicUrl(path);
-            }
+
             baseMapper.updateById(wmsGoods);
 
         } else {
@@ -96,7 +93,7 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
             for (UrlsVo url : dto.getUrls()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java

@@ -46,6 +46,9 @@ public class BaseGoodsSpuVo implements Vo {
     private String isListed;//是否上架
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String typeName;//类型
+    private String brandName;//品牌
+    private String manufacturerName;//厂家
     private BaseGoodsSpuDetailVo baseGoodsSpuDetail;
     private List<BaseGoodsSkuVo> baseGoodsSkus;
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java

@@ -29,7 +29,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerQuery query = pq.getParams();
         QueryWrapper<BaseManufacturer> qw = new QueryWrapper<>();
         if(StringUtils.isNotBlank(query.getName())){
-            qw.like("goodsTypeName",query.getName());
+            qw.like("manufacturerName",query.getName());
         }
 
         IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java

@@ -10,22 +10,11 @@ import lombok.Data;
 @Data
 public class WmsWarehouseExtend extends BaseEntity {
 
-    private String warehouseName;//仓库名称
-    private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
-    private String manager;//主管
-    private String areaSid;//地区sid
-    private String address;//地址
-    private String longitude;//经度
-    private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private String usageStatus;//使用状态,0停用 1正常
-    private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+    private String warehouseSid;//仓库sid
+    private String markupRate1;//加价率1
+    private String markupRate2;//加价率2
+    private String markupRate3;//加价率3
+    private String markupRate4;//加价率4
+    private String markupRate5;//加价率5
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java

@@ -23,21 +23,11 @@ public class WmsWarehouseExtendVo implements Vo {
     private String isEnable;
     private String state;
     private String isDelete;
+    private String warehouseSid;//仓库sid
     private String warehouseName;//仓库名称
-    private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
-    private String manager;//主管
-    private String areaSid;//地区sid
-    private String address;//地址
-    private String longitude;//经度
-    private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private String usageStatus;//使用状态,0停用 1正常
-    private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+    private String markupRate1;//加价率1
+    private String markupRate2;//加价率2
+    private String markupRate3;//加价率3
+    private String markupRate4;//加价率4
+    private String markupRate5;//加价率5
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -64,8 +64,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
 //            }
-            dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-            wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            if(dto.getWmsWarehouseExtendDto()!=null){
+                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            }
         } else {
             WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo();
             sid = wmsWarehouse.getSid();
@@ -75,8 +77,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
 //            }
-            dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-            wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            if(dto.getWmsWarehouseExtendDto()!=null){
+                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            }
+
         }
 
         return rb.success().setMsg("成功");

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java

@@ -17,6 +17,8 @@ import java.util.List;
 public class WmsAnsBillDto {
 
     private String sid;
+    private String createBySid;
+    private String orgPath;
 
     @ApiModelProperty("外部单号（业务单据编号）")
     private String sourceBillNo;