Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.fintemptimepush;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "金蝶数据推送-临时表", description = "金蝶数据推送-临时表")
+@TableName("fin_temp_time_push")
+@Data
+public class FinTempTimePush extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务类型")
+    private String busType;
+
+
+
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.fin.api.fintemptimepush;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FinTempTimePushDto implements Dto {
+
+    private String createBySid;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("业务类型")
+    private String busType;
+
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.fin.api.fintemptimepush;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Api(tags = "金蝶数据推送-临时表")
+@FeignClient(
+        contextId = "anrui-fin-FinTempTimePush",
+        name = "anrui-fin",
+        path = "v1/FinTempTimePush")
+public interface FinTempTimePushFeign {
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody FinTempTimePushDto dto);
+
+
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java

@@ -0,0 +1,40 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FinTempTimePushMapper extends BaseMapper<FinTempTimePush> {
+
+
+    List<FinTempTimePush> selListByBusType(@Param("busType") String busType);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml

@@ -0,0 +1,13 @@
+<?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.fin.biz.fintemptimepush.FinTempTimePushMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="selListByBusType" resultType="com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush">
+        select *
+        from fin_temp_time_push
+        where busType = #{busType}
+    </select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "金蝶数据推送-临时表")
+@RestController("com.yxt.anrui.fin.biz.fintemptimepush.FinTempTimePushRest")
+@RequestMapping("v1/FinTempTimePush")
+public class FinTempTimePushRest implements FinTempTimePushFeign {
+
+    @Autowired
+    private FinTempTimePushService finTempTimePushService;
+    @Override
+    public ResultBean save(FinTempTimePushDto dto) {
+        return finTempTimePushService.saveEntity(dto);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java

@@ -0,0 +1,52 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class FinTempTimePushService extends MybatisBaseService<FinTempTimePushMapper, FinTempTimePush> {
+
+
+    public ResultBean saveEntity(FinTempTimePushDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinTempTimePush finTempTimePush = new FinTempTimePush();
+        BeanUtil.copyProperties(dto,finTempTimePush);
+        baseMapper.insert(finTempTimePush);
+        return rb.success();
+    }
+
+    public List<FinTempTimePush> selListByBusType(String busType) {
+        return baseMapper.selListByBusType(busType);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.fin.biz.fintemptimepush;
+
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush;
+import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/7 14:02
+ */
+@Component
+public class TimingPushService {
+
+    @Autowired
+    private LoanMonthlyAccrualApplyFeign loanMonthlyAccrualApplyFeign;
+    @Autowired
+    private FinTempTimePushService finTempTimePushService;
+
+    /**
+     * 定时推送月还计提凭证
+     */
+    @Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ? ") //每月2-10号 3点推送
+    public void monthlyAccrualVoucher() {
+      List<FinTempTimePush> list = finTempTimePushService.selListByBusType("月还计提");
+      list.removeAll(Collections.singleton(null));
+      if (!list.isEmpty()) {
+          for (FinTempTimePush f : list) {
+              loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid());
+              finTempTimePushService.deleteBySid(f.getSid());
+          }
+      }
+
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -1187,9 +1187,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             newVoucher.setAccountBook(voucher.getUseOrgCode());
             newVoucher.setVoucherNo(voucher.getUseOrgCode());
         }
-        Date date = new Date();
+        String formatDate = voucher.getBussDate();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String formatDate = sdf.format(date);
         String[] split = formatDate.split("-");
         String month = split[1];
         int m = Integer.parseInt(month);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -15,6 +15,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto;
+import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -124,6 +126,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
     private MessageListFeign messageListFeign;
     @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
+    @Autowired
+    private FinTempTimePushFeign finTempTimePushFeign;
 
     public ResultBean<LoanMonthlyAccrualApplyInit> accrualInit(String orgPath) {
         ResultBean<LoanMonthlyAccrualApplyInit> rb = ResultBean.fireFail();
@@ -636,21 +640,27 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
                 LoanMonthlyAccrualApply accrualApply = fetchBySid(businessSid);
                 accrualApply.setClosingDate(new DateTime());
                 baseMapper.updateById(accrualApply);
-                try {
+                //推送金蝶保存数据临时表
-                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                FinTempTimePushDto finTempTimePushDto = new FinTempTimePushDto();
-                            .setNameFormat("demo-pool-%d").build();
+                finTempTimePushDto.setCreateBySid(accrualApply.getCreateBySid());
-                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
+                finTempTimePushDto.setBusSid(businessSid);
-                            1000, TimeUnit.MILLISECONDS,
+                finTempTimePushDto.setBusType("月还计提");
-                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
+                finTempTimePushFeign.save(finTempTimePushDto);
-                    //推送月还计提凭证数据
+//                try {
-                    Future future = pool.submit(() -> {
+//                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                        pushAccrualVoucher(businessSid);
+//                            .setNameFormat("demo-pool-%d").build();
-                    });
+//                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
-                } catch (Exception e) {
+//                            1000, TimeUnit.MILLISECONDS,
-                    e.printStackTrace();
+//                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
-                    log.error("推送数据失败=========================" + e.getMessage());
+//                    //推送月还计提凭证数据
-                    return rb.setMsg("推送数据失败");
+//                    Future future = pool.submit(() -> {
-                }
+//                        pushAccrualVoucher(businessSid);
+//                    });
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    log.error("推送数据失败=========================" + e.getMessage());
+//                    return rb.setMsg("推送数据失败");
+//                }
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -659,6 +669,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
     }
 
     private void pushAccrualVoucher(String businessSid) {
+        LoanMonthlyAccrualApply apply = fetchBySid(businessSid);
         List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(businessSid);
         if (!records.isEmpty()) {
             int index = 1000;
@@ -669,6 +680,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
                 List<LoanMonthlyAccrualRecord> newList = records.subList(i, i + index);
                 if (!newList.isEmpty()) {
                     GeneralVoucher generalVoucher = new GeneralVoucher();
+                    generalVoucher.setBussDate(DateUtil.formatDate(apply.getClosingDate()));
                     List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                     for (LoanMonthlyAccrualRecord v : newList) {
                         LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();

yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue

@@ -13,15 +13,9 @@
         <!-- end 添加修改按钮 -->
         <!-- end 详情按钮 -->
       </div>
-
       <div class="listconadd">
-
         <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-          <!-- <div class="title">
-          <div>基础信息</div>
-        </div> -->
           <el-row class="first_row">
-
             <el-col :span="8">
               <div class="span-sty">申请人</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -35,25 +29,23 @@
               <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="24">
               <div class="span-sty">备注</div>
-              <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+              <el-form-item>
-                  type="textarea" :rows="4" clearable /></el-form-item>
+                <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
+              </el-form-item>
             </el-col>
           </el-row>
-
           <div class="title titleOne">
             <div>商品类别列表</div>
             <el-button type="primary" size="mini" class="btntopblueline" @click="categoryAdd()">添加</el-button>
           </div>
           <el-table v-loading="listLoading" :data="formobj.smsPricestrategyBillDetailList" border style="width: 100%;">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
             <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" wid align="center" width="200">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="deleteGoodsType(scope.row)">删除</el-button>
+                <el-button type="primary" size="mini" @click="deleteGoodsType(scope.$index)">删除</el-button>
                 <el-button type="primary" size="mini" @click="editPriceStrategy(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
@@ -69,14 +61,10 @@
                 {{ calculation2(scope.row) }}
               </template>
             </el-table-column>
-
           </el-table>
-
         </el-form>
-
       </div>
     </div>
-
     <!-- 选择商品类别 -->
     <choosecategory v-show="viewState == 2" ref="choosecategory" @backData="backData" @doback="resetState"/>
     <!-- 编辑价格策略 -->
@@ -94,6 +82,7 @@
 import {
   getOrgSidByPath
 } from '@/api/Common/dictcommons'
+
 export default {
   components: {
     choosecategory,
@@ -101,75 +90,59 @@
   },
   data() {
     return {
-        title: "【新增】",
+      title: '【新增】',
       viewState: 1,
       listLoading: false,
       submitdisabled: false,
       formobj: {
-          "sid": "",
+        sid: '',
-          "createByName": window.sessionStorage.getItem('name'),
+        createByName: window.sessionStorage.getItem('name'),
-          "billNo": "",
+        billNo: '',
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+        deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
           .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+        deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
           .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "remarks": "",
+        remarks: '',
-          "createBySid": window.sessionStorage.getItem('userSid'),
+        createBySid: window.sessionStorage.getItem('userSid'),
-          "createTime": getCurrentDate(),
+        createTime: getCurrentDate(),
-          "procDefId": "",
+        procDefId: '',
-          "nodeId": "",
+        nodeId: '',
-          "procInstId": "",
+        procInstId: '',
-          "nodeState": "",
+        nodeState: '',
-          "taskId": "",
+        taskId: '',
-          "finishTime": "",
+        finishTime: '',
-          "useOrgSid": "",
+        useOrgSid: '',
-          "useOrgName": "",
+        useOrgName: '',
-          "smsPricestrategyBillDetailList": []
+        smsPricestrategyBillDetailList: []
-        },
+      }
-
     }
-    },
-    created() {
-
   },
   methods: {
-
     calculation(row) {
-        console.log("calculation》》》》", row)
       var info = ''
-
       if (row.strategyType == 1) {
         info = '固定比例'
       }
       if (row.strategyType == 2) {
         info = '价格区间'
       }
-
       return info
     },
     calculation2(row) {
       var info = ''
-
       if (row.strategyType == 2) {
         for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
-
+          info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
-            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + row
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       } else {
-          info = row.gdMarkupRate
+        info = row.gdMarkupRate + '%'
       }
-
-
       return info
     },
-
+    deleteGoodsType(index) {
-      deleteGoodsType(row) {
-
-        const index = this.formobj.smsPricestrategyBillDetailList.findIndex((item) => item === row)
-        console.log("index》》》》", index)
       this.formobj.smsPricestrategyBillDetailList.splice(index, 1)
     },
     editPriceStrategy(row) {
@@ -179,58 +152,35 @@
     },
     backData(value) {
       this.viewState = 1
-        console.log('>>>>>>>>>backData', value)
-
       for (var i = 0; i < value.length; i++) {
-
         this.formobj.smsPricestrategyBillDetailList.push(
-
           {
             goodsTypeSid: value[i].sid,
             goodsTypeCode: value[i].goodsTypeCode,
             goodsTypeName: value[i].goodsTypeName,
             strategyType: '',
             strategyTypeValue: '',
-              gdMarkupRate: "",
+            gdMarkupRate: '',
             strategyDetail: '',
             smsPricestrategyBillGoodstypedetailList: []
-
           }
-
         )
-
       }
-
     },
     backData2(value) {
       this.viewState = 1
-        console.log('>>>>>>>>>backData2', value)
-
       var info = ''
-
       if (value.strategyType == 2) {
         for (var i = 0; i < value.smsPricestrategyBillGoodstypedetailList.length; i++) {
-
+          info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + value
-            info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + value
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + value
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + value
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       }
-
+      const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value.goodsTypeSid)
-
-        console.log('>>>>>>>>>backData2', info)
-
-        const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value
-          .goodsTypeSid)
-        console.log('>>>>>>>>>busTypeSelect', choose)
-
-        // choose[0].strategyDetail = value.strategyType == 0 ? value.gdMarkupRate : info
       choose[0].smsPricestrategyBillGoodstypedetailList = value.smsPricestrategyBillGoodstypedetailList
       choose[0].strategyType = value.strategyType
-        // choose[0].strategyTypeValue = value.strategyType == 0 ? '固定比例' : '价格区间'
-
-
       if (value.strategyType == 1) {
         choose[0].strategyTypeValue = '固定比例'
         choose[0].strategyDetail = value.gdMarkupRate
@@ -239,14 +189,10 @@
         choose[0].strategyTypeValue = '价格区间'
         choose[0].strategyDetail = info
       }
-
-        console.log('>>>>>>>>>backData2', choose)
-
     },
     resetState() {
       this.viewState = 1
     },
-
     categoryAdd() {
       this.viewState = 2
       const aa = []
@@ -256,9 +202,6 @@
       return index + 1
     },
     saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-
-
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -280,8 +223,6 @@
       })
     },
     submintdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-
       if (this.formobj.smsPricestrategyBillDetailList.length == 0) {
         this.$message({
           showClose: true,
@@ -290,8 +231,6 @@
         })
         return
       }
-
-
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -315,17 +254,12 @@
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.submitdisabled = false
-        this.formobj = {
+      this.formobj = {}
-
-        }
       this.$emit('doback')
     },
-
     showAdd() {
       this.title = '【新增】'
-        getOrgSidByPath({
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((res) => {
         if (res.success) {
           this.formobj.createOrgSid = res.data
           this.formobj.useOrgSid = res.data
@@ -333,16 +267,12 @@
       })
     },
     showEdit(row) {
-
       this.title = '【编辑】'
-
+      req.init(row.sid).then(resp => {
-        req.init(row.sid)
-          .then(resp => {
         if (resp.success) {
           this.formobj = resp.data
         }
-          })
+      }).catch(e => {
-          .catch(e => {
         this.formobj = {}
       })
     }

yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <div class="tab-header webtop">
       <!-- 标题 -->
       <div>定调价策略申请</div>
@@ -11,15 +10,9 @@
       <!-- end 添加修改按钮 -->
       <!-- end 详情按钮 -->
     </div>
-
     <div class="listconadd">
-
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-        <!-- <div class="title">
-          <div>基础信息</div>
-        </div> -->
         <el-row class="first_row">
-
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -33,20 +26,16 @@
             <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-
+        <div class="title">
-        <div class="title titleOne">
           <div>商品类别列表</div>
-          <!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button> -->
         </div>
         <el-table v-loading="listLoading" :data="formobj.smsPricestrategyBillDetailList" border style="width: 100%;">
-          <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
           <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column label="类别编码" prop="goodsTypeCode" align="center"/>
           <el-table-column label="类别名称" prop="goodsTypeName" align="center"/>
@@ -60,32 +49,25 @@
               {{ calculation2(scope.row) }}
             </template>
           </el-table-column>
-
         </el-table>
-
       </el-form>
-
     </div>
   </div>
 </template>
 
 <script>
 import req from '@/api/storage/adjustment.js'
+
 export default {
   components: {},
   data() {
     return {
       listLoading: false,
       submitdisabled: false,
-        formobj: {
+      formobj: {}
-
-        },
-
     }
   },
-    created() {},
   methods: {
-
     calculation(row) {
       var info = ''
       if (row.strategyType == 1) {
@@ -98,49 +80,35 @@
     },
     calculation2(row) {
       var info = ''
-
       if (row.smsPricestrategyBillGoodstypedetailList != null && row.smsPricestrategyBillGoodstypedetailList.length >
         0) {
         for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
 
-            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+          info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + row
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       } else {
-          info = row.gdMarkupRate
+        info = row.gdMarkupRate + '%'
       }
-
-
       return info
     },
     indexMethod(index) {
       return index + 1
     },
 
-      handleReturn(isreload) {
+    handleReturn() {
-        if (isreload === 'true') this.$emit('reloadlist')
       this.submitdisabled = false
-        this.formobj = {
+      this.formobj = {}
-
-        }
       this.$emit('doback')
     },
-
-      showAdd() {
-
-      },
     showInfo(row) {
-
+      req.init(row.sid).then(resp => {
-        req.init(row.sid)
-          .then(resp => {
         if (resp.success) {
           this.formobj = resp.data
-
         }
-          })
+      }).catch(e => {
-          .catch(e => {
         this.formobj = {}
       })
     }
@@ -152,10 +120,6 @@
   margin-left: 120px !important;
 }
 
-  .must {
-    color: #f00;
-  }
-
 .span-sty {
   width: 130px !important;
 }
@@ -172,12 +136,4 @@
 .first_row {
   border-top: 1px solid #E0E3EB;
 }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
 </style>

yxt-as-ui/src/views/storage/adjustment/index.vue

@@ -10,7 +10,7 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
               <el-form-item label="分公司">
-                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable />
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
@@ -22,18 +22,14 @@
                 <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请日期">
-                <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="办结日期">
-                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -49,14 +45,12 @@
         </div>
         <!--Start 主页面主要部分 -->
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
-            @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)"
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
-                  :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -66,7 +60,6 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="nodeState" label="流程状态" align="center"  /> -->
             <el-table-column prop="billNo" label="单据编号" align="center" />
             <el-table-column prop="useOrgName" label="分公司" align="center" />
             <el-table-column prop="deptName" label="申请部门" align="center" />
@@ -78,8 +71,7 @@
         <div class="pages">
           <div class="tit"/>
           <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
         <!--End查询列表部分-->
       </div>
@@ -90,23 +82,17 @@
     <adjustmentInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
     <!-- 流程审批记录 -->
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
-      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
-        :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/storage/adjustment.js'
-  import {
+import { typeValues } from '@/api/Common/dictcommons'
-    typeValues
+import { getStorage } from '@/utils/auth'
-  } from '@/api/Common/dictcommons'
-  import {
-    getStorage
-  } from '@/utils/auth'
 import adjustmentAdd from './adjustmentAdd'
 import adjustmentInfo from './adjustmentInfo'
 
@@ -114,7 +100,6 @@
   name: 'Procurement',
   components: {
     Pagination,
-      pageye,
     ButtonBar,
     adjustmentAdd,
     adjustmentInfo
@@ -162,7 +147,7 @@
         size: 5,
         total: 0,
         params: {
-            createOrgName: '',
+          useOrgName: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -170,6 +155,9 @@
           createEndTime: '',
           finishStartTime: '',
           finishEndTime: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
         }
       }
     }
@@ -289,7 +277,7 @@
         size: 5,
         total: 0,
         params: {
-            createOrgName: '',
+          useOrgName: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -297,12 +285,15 @@
           createEndTime: '',
           finishStartTime: '',
           finishEndTime: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
         }
       }
       this.getList()
     },
     toAdd() {
-        this.viewState = 3
+      this.viewState = 2
       this.$refs['divAdd'].showAdd()
     },
     toEdit(row) {
@@ -347,7 +338,8 @@
         }).catch(e => {
           loading.close()
         })
-        }).catch(() => {})
+      }).catch(() => {
+      })
     },
     // 修改、编辑、详情返回列表页面
     resetState() {

yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue

@@ -31,17 +31,21 @@
                 <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="单据类型">
-                <el-input v-model="listQuery.params.billType" placeholder="" clearable />
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="业务类型">
-                <el-input v-model="listQuery.params.busTypeValue" placeholder="" clearable />
+                <el-select v-model="listQuery.params.busTypeValue" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in busType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="发生时间">
-                <el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="操作人">
                 <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
@@ -59,8 +63,7 @@
         <!--End查询列表部分-->
         <div class="listtop">
           <div class="tit">商品出入库列表</div>
-          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
         <!--Start 主页面主要部分 -->
         <div class="">
@@ -87,7 +90,7 @@
             <el-table-column prop="currentCount" label="出入库后的库存" align="center" width="150" />
             <el-table-column prop="cost" label="出入库单价" align="center" width="140" />
             <el-table-column prop="amount" label="出入库金额" align="center" width="140" />
-            <el-table-column prop="tax" label="税率" align="center" width="100" />
+            <el-table-column prop="tax" label="税率(%)" align="center" width="100" />
             <el-table-column prop="guidPrice" label="销售指导价" align="center" width="130" />
             <el-table-column prop="createByName" label="操作人" align="center" width="100" />
             <el-table-column prop="handlerName" label="经办人" align="center" width="100" />
@@ -97,8 +100,7 @@
         <div class="pages">
           <div class="tit"/>
           <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
         <!--End查询列表部分-->
       </div>
@@ -111,6 +113,7 @@
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/storage/inventory'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'InventoryRefer',
@@ -143,6 +146,17 @@
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      busType_list: [],
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '出库'
+        },
+        {
+          dictKey: '1',
+          dictValue: '入库'
+        }
+      ],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -175,12 +189,20 @@
   },
   created() {
     // 初始化变量
+    this.init()
     this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'wms_busType' }).then((res) => {
+        if (res.success) {
+          this.busType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -275,7 +297,7 @@
         const fileName = '出入库记录' + '.xls'
         const elink = document.createElement('a')
         elink.download = fileName
-          elink.style.display = 'nonde'
+        elink.style.display = 'none'
         elink.href = URL.createObjectURL(blob)
         document.body.appendChild(elink)
         elink.click()

yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue

@@ -82,8 +82,10 @@
             <span>意见:</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
+            <el-form-item>
-                type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
+              <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
+                        type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -199,32 +201,26 @@
     calculation(row) {
       console.log("calculation》》》》", row)
       var info = ''
-
       if (row.strategyType == 1) {
         info = '固定比例'
       }
       if (row.strategyType == 2) {
         info = '价格区间'
       }
-
       return info
     },
     calculation2(row) {
       var info = ''
-
       if (row.strategyType == 2) {
         for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
-
+          info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
-            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + row
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       } else {
-          info = row.gdMarkupRate
+        info = row.gdMarkupRate + '%'
       }
-
-
       return info
     },
     showInfo(sid) {

yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue

@@ -23,15 +23,16 @@
               <div class="span-sty">申请日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">备注</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable
+              <el-form-item>
-                  placeholder="" /></el-form-item>
+                <el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder=""/>
-              <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+              </el-form-item>
-                  type="textarea" :rows="4" clearable /></el-form-item>
+              <el-form-item>
+                <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="title">商品类别列表</div>
@@ -39,7 +40,7 @@
             <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" wid align="center" width="200">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="deleteGoodsType(scope.row)">删除</el-button>
+                <el-button type="primary" size="mini" @click="deleteGoodsType(scope.$index)">删除</el-button>
                 <el-button type="primary" size="mini" @click="editPriceStrategy(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
@@ -55,27 +56,22 @@
                 {{ calculation2(scope.row) }}
               </template>
             </el-table-column>
-
           </el-table>
         </el-form>
       </div>
     </div>
-
     <!-- 选择商品类别 -->
     <choosecategory v-show="viewState == 2" ref="choosecategory" @backData="backData" @doback="resetState"/>
     <!-- 编辑价格策略 -->
     <editPriceStrategy v-show="viewState == 3" ref="editPriceStrategy" @backData2="backData2" @doback="resetState"/>
-
   </div>
 </template>
 
 <script>
 import req from '@/api/storage/adjustment.js'
-  import {
-    getCurrentDate
-  } from '@/utils/index.js'
 import choosecategory from './relation/choosecategory'
 import editPriceStrategy from './relation/editPriceStrategy'
+
 export default {
   components: {
     choosecategory,
@@ -105,7 +101,7 @@
         "useOrgSid": "",
         "useOrgName": "",
         "smsPricestrategyBillDetailList": []
-        },
+      }
     }
   },
   created() {
@@ -128,41 +124,30 @@
   methods: {
 
     calculation(row) {
-        console.log("calculation》》》》", row)
       var info = ''
-
       if (row.strategyType == 1) {
         info = '固定比例'
       }
       if (row.strategyType == 2) {
         info = '价格区间'
       }
-
       return info
     },
     calculation2(row) {
       var info = ''
-
       if (row.strategyType == 2) {
         for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
-
+          info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
-            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + row
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       } else {
-          info = row.gdMarkupRate
+        info = row.gdMarkupRate + '%'
       }
-
-
       return info
     },
-
+    deleteGoodsType(index) {
-      deleteGoodsType(row) {
-
-        const index = this.formobj.smsPricestrategyBillDetailList.findIndex((item) => item === row)
-        console.log("index》》》》", index)
       this.formobj.smsPricestrategyBillDetailList.splice(index, 1)
     },
     editPriceStrategy(row) {
@@ -172,12 +157,8 @@
     },
     backData(value) {
       this.viewState = 1
-        console.log('>>>>>>>>>backData', value)
-
       for (var i = 0; i < value.length; i++) {
-
         this.formobj.smsPricestrategyBillDetailList.push(
-
           {
             goodsTypeSid: value[i].sid,
             goodsTypeCode: value[i].goodsTypeCode,
@@ -187,43 +168,24 @@
             gdMarkupRate: "",
             strategyDetail: '',
             smsPricestrategyBillGoodstypedetailList: []
-
           }
-
         )
-
       }
-
     },
     backData2(value) {
       this.viewState = 1
-        console.log('>>>>>>>>>backData2', value)
-
       var info = ''
-
       if (value.strategyType == 2) {
         for (var i = 0; i < value.smsPricestrategyBillGoodstypedetailList.length; i++) {
-
+          info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + value
-            info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + value
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + value
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + value
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       }
-
+      const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value.goodsTypeSid)
-
-        console.log('>>>>>>>>>backData2', info)
-
-        const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value
-          .goodsTypeSid)
-        console.log('>>>>>>>>>busTypeSelect', choose)
-
-        // choose[0].strategyDetail = value.strategyType == 0 ? value.gdMarkupRate : info
       choose[0].smsPricestrategyBillGoodstypedetailList = value.smsPricestrategyBillGoodstypedetailList
       choose[0].strategyType = value.strategyType
-        // choose[0].strategyTypeValue = value.strategyType == 0 ? '固定比例' : '价格区间'
-
-
       if (value.strategyType == 1) {
         choose[0].strategyTypeValue = '固定比例'
         choose[0].strategyDetail = value.gdMarkupRate
@@ -232,14 +194,10 @@
         choose[0].strategyTypeValue = '价格区间'
         choose[0].strategyDetail = info
       }
-
-        console.log('>>>>>>>>>backData2', choose)
-
     },
     resetState() {
       this.viewState = 1
     },
-
     categoryAdd() {
       this.viewState = 2
       const aa = []
@@ -248,7 +206,6 @@
     indexMethod(index) {
       return index + 1
     },
-
     showInfo(sid) {
       this.viewTitle = '【编辑】定调价策略申请'
       this.$nextTick(() => {

yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue

@@ -124,32 +124,26 @@
     calculation(row) {
       console.log("calculation》》》》", row)
       var info = ''
-
       if (row.strategyType == 1) {
         info = '固定比例'
       }
       if (row.strategyType == 2) {
         info = '价格区间'
       }
-
       return info
     },
     calculation2(row) {
       var info = ''
-
       if (row.strategyType == 2) {
         for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
-
+          info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + '-' + row
-            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+            .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + '  ' + row
-              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
             .smsPricestrategyBillGoodstypedetailList[i]
-              .markupRate + "；"
+            .markupRate + '%;'
         }
       } else {
-          info = row.gdMarkupRate
+        info = row.gdMarkupRate + '%'
       }
-
-
       return info
     },
     showInfo(sid) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -14,8 +14,6 @@ import com.yxt.anrui.as.api.asbusrepairinventorybill.*;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
-import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo;
-import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
 import com.yxt.anrui.as.api.utils.AsRule;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
 import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
@@ -40,7 +38,6 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import javassist.Loader;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -263,6 +260,19 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
     public String saveBill(AsBusrepairInventorybillDto dto, String busTypeKey) {
         AsBusrepairInventorybill entity = new AsBusrepairInventorybill();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        String sourceBillSid = entity.getSourceBillSid();//维修单sid
+        AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(sourceBillSid);
+        String customerSid = "";
+        String customerName = "";
+        if (null != asBusrepairBill) {
+            if (StringUtils.isNotBlank(asBusrepairBill.getCustomerSid())) {
+                customerSid = asBusrepairBill.getCustomerSid();
+            }
+            if (StringUtils.isNotBlank(asBusrepairBill.getCustomerName())) {
+                customerName = asBusrepairBill.getCustomerName();
+            }
+        }
+
         int isEnable = 0;
         if (busTypeKey.equals("0")) {
             entity.setBusTypeKey("0");
@@ -383,6 +393,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                     BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                     recordDto.setCount(sDto.getCount());
                     recordDto.setCurrentCount(subtractCount.toString());
+                    recordDto.setCustomerSid(customerSid);
+                    recordDto.setCustomerName(customerName);
                     wmsInventoryRecordFeign.save(recordDto);
                 } else if (busTypeKey.equals("1")) {
                     //维修退库
@@ -405,6 +417,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                     BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                     recordDto.setCount(sDto.getCount());
                     recordDto.setCurrentCount(add.toString());
+                    recordDto.setCustomerSid(customerSid);
+                    recordDto.setCustomerName(customerName);
                     wmsInventoryRecordFeign.save(recordDto);
                 }
                 wmsInventoryFeign.updateInventoryCount(countQuery);

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordDto.java

@@ -125,4 +125,8 @@ public class WmsInventoryRecordDto implements Dto {
     private String preBillSid;
     @ApiModelProperty("前一单编号")
     private String preBillNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java

@@ -963,6 +963,8 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                         BeanUtil.copyProperties(inventory, recordDto, "sid", "createBySid");
                         recordDto.setCount(inventoryCount.toString());
                         recordDto.setCurrentCount(subtractCount.toString());
+                        recordDto.setCustomerSid(smsSalesBill.getCustomerSid());
+                        recordDto.setCustomerName(smsSalesBill.getCustomerName());
                         wmsInventoryRecordFeign.save(recordDto);
                         WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery();
                         countQuery.setSid(inventorySid);

yxt-sms-biz/src/main/java/com/yxt/sms/feign/wms/wmsinventoryrecord/WmsInventoryRecordDto.java

@@ -112,5 +112,8 @@ public class WmsInventoryRecordDto implements Dto {
     private String createOrgSid;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
-
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java

@@ -150,6 +150,9 @@ public class WmsInventoryRecordRest {
 	@PostMapping("/pageList")
 	ResultBean<PagerVo<WmsInventoryRecordsVo>> pageList(@RequestBody PagerQuery<WmsInventoryRecordsQuery> pagerQuery){
 		ResultBean<PagerVo<WmsInventoryRecordsVo>> rb = ResultBean.fireFail();
+		WmsInventoryRecordsQuery params = pagerQuery.getParams();
+		params.setType("配件库");
+		pagerQuery.setParams(params);
 		PagerVo<WmsInventoryRecordsVo> pv = wmsInventoryRecordService.listPage(pagerQuery);
 		return rb.success().setData(pv);
 	}
@@ -166,6 +169,7 @@ public class WmsInventoryRecordRest {
 	@PostMapping("/exportExcel")
 	@ApiOperation(value = "出入库记录导出")
 	public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) {
+		query.setType("配件库");
 		//得到所有要导出的数据
 		List<WmsInventoryRecordsExcelVo> exportVoList = wmsInventoryRecordService.listExcel(query);
 		//定义导出的excel名字

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java

@@ -118,4 +118,8 @@ public class WmsInventoryRecord extends BaseEntity {
     private String preBillSid;
     @ApiModelProperty("前一单编号")
     private String preBillNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java

@@ -27,13 +27,10 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord;
 
 
 import com.yxt.common.core.dto.Dto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: wms(yxt) <br/>
  * File: WmsInventoryRecordDto.java <br/>
@@ -128,4 +125,8 @@ public class WmsInventoryRecordDto implements Dto {
     private String preBillSid;
     @ApiModelProperty("前一单编号")
     private String preBillNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java

@@ -28,28 +28,24 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.wms.biz.inventory.wmsinventory.WmsInventory;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
-import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*;
 import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
-import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
-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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -318,9 +314,7 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
             qw.like("wir.handlerName", query.getHandlerName());
         }
         if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("拆件库")) {
+            qw.eq("i.warehouseTypeValue", query.getType());
-                qw.eq("i.warehouseTypeValue", "拆件库");
-            }
         }
         IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
@@ -415,9 +409,7 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
             qw.like("wir.handlerName", query.getHandlerName());
         }
         if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("拆件库")) {
+            qw.eq("i.warehouseTypeValue", query.getType());
-                qw.eq("i.warehouseTypeValue", "拆件库");
-            }
         }
         List<WmsInventoryRecordsExcelVo> list = baseMapper.listExcel(qw);
         list.removeAll(Collections.singleton(null));

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -795,8 +795,9 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 recordDto.setHandlerSid(dto.getUserSid());
                 recordDto.setHandlerName(createByName);
                 recordDto.setGoodsID(goodsID);
-                recordDto.setSourceBillSid(shelvesId);
+                recordDto.setPreBillSid(shelvesId);
-                recordDto.setBillNo(wmsShelfBill.getBillNo());
+                recordDto.setPreBillNo(wmsShelfBill.getBillNo());
+
                 recordDto.setBillType("1");
                 recordDto.setBusTypeKey("01");
                 recordDto.setBusTypeValue("采购入库");
@@ -821,6 +822,8 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                         String ansSid = wmsReceiptBill.getSourceBillSid(); //预约入库sid
                         WmsAnsBill ansBill = wmsAnsBillService.fetchBySid(ansSid);
                         if (null != ansBill) {
+                            recordDto.setSourceBillSid(ansBill.getSourceBillSid());
+                            recordDto.setBillNo(ansBill.getSourceBillNo());
                             if (null != ansBill.getTaxRate()) {
                                 recordDto.setTaxRate(ansBill.getTaxRate().toString());
                             }