Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.java

@@ -20,6 +20,7 @@ public interface LoanPushFundHistoryMapper extends BaseMapper<LoanPushFundHistor
 
 
     int saveLists(@Param("list") List<LoanPushFundHistory> list);
+    int saveList(@Param("list") List<LoanPushFundHistory> list);
 
     String getLastDateByBusVinSid(@Param("busVinSid") String busVinSid);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml

@@ -10,6 +10,13 @@
             (#{item.sid},#{item.busVinSid},#{item.useOrgSid},#{item.useOrgName},#{item.fund},#{item.lastAccrualDate})
         </foreach>
     </insert>
+    <insert id="saveList" parameterType="java.util.List">
+        insert into loan_push_fund_history(sid,isEnable,busVinSid,useOrgSid,useOrgName,fund,lastAccrualDate)
+        values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.sid},#{item.isEnable},#{item.busVinSid},#{item.useOrgSid},#{item.useOrgName},#{item.fund},#{item.lastAccrualDate})
+        </foreach>
+    </insert>
     <select id="getLastDateByBusVinSid" resultType="java.lang.String">
         SELECT
             createTime
@@ -61,4 +68,4 @@
             a.times = #{times}
           AND p.useOrgSid = #{useOrgSid}
     </select>
-</mapper>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java

@@ -52,6 +52,9 @@ public class LoanPushFundHistoryService extends MybatisBaseService<LoanPushFundH
     public int saveLists(List<LoanPushFundHistory> list) {
         return baseMapper.saveLists(list);
     }
+    public int saveList(List<LoanPushFundHistory> list) {
+        return baseMapper.saveList(list);
+    }
 
     public PagerVo<LoanPushFundHistoryVo> listPage(PagerQuery<LoanPushFundHistoryQuery> pq) {
         LoanPushFundHistoryQuery pagerQuery = pq.getParams();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -806,6 +806,11 @@
         WHERE
         s.receivablesName = '资金占用费'
         OR s.receivablesName = '资方逾期利息'
+        OR s.receivablesName = '资方退还垫款'
+        OR s.receivablesName = '其他费用'
+        OR s.receivablesName = '合同违约金'
+        OR s.receivablesName = '名义价'
+        OR s.receivablesName = '结清时资方逾期利息'
         AND s.auditState = 3
         ) AS a,(
         SELECT

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay;
+import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
@@ -53,6 +54,7 @@ import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
 import com.yxt.anrui.riskcenter.biz.loanfinotherPolicy.LoanFinOtherPolicyService;
 import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayService;
+import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
@@ -155,7 +157,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
     private LoanFundDayService loanFundDayService;
     @Autowired
     private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
-
+    @Autowired
+    private LoanPushFundHistoryService loanPushFundHistoryService;
     /**
      * 根据销售订单SID生成还款计划表回显
      *
@@ -5955,6 +5958,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
         List<FinUncollectedReceivablesDetailedJR> jrList = new ArrayList<>();//金融应收
         List<LoanFundDay> loanFundDays = new ArrayList<>();//资金占用费生成记录
+        List<LoanPushFundHistory> pushFundHistories = new ArrayList<>();//资金占用费计提记录
         for (LoanRepaymentSchedule schedule : data) {
             BigDecimal Q = BigDecimal.ZERO; //累欠金额
             BigDecimal T = BigDecimal.ZERO; //其中公司垫还资方金额
@@ -6069,6 +6073,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 fundDay.setBusSid(plan.getSid());
                                 fundDay.setIsEnable(3);
                                 loanFundDays.add(fundDay);
+                                //生成资金占用费计提记录
+                                LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                pushFundHistory.setCreateBySid(userSid);
+                                pushFundHistory.setFund(B);
+                                pushFundHistory.setBusVinSid(plan.getBusVinSid());
+                                pushFundHistory.setIsEnable(3);
+                                pushFundHistory.setUseOrgSid(plan.getUseOrgSid());
+                                pushFundHistory.setUseOrgName(plan.getUseOrgName());
+                                pushFundHistories.add(pushFundHistory);
                             }
                             if (pd) {
                                 planDetails.add(plan);
@@ -6195,6 +6208,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setFund(B1);
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
+                                    //生成资金占用费计提记录
+                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    pushFundHistory.setCreateBySid(userSid);
+                                    pushFundHistory.setFund(B1);
+                                    pushFundHistory.setBusVinSid(p.getBusVinSid());
+                                    pushFundHistory.setIsEnable(3);
+                                    pushFundHistory.setUseOrgSid(p.getUseOrgSid());
+                                    pushFundHistory.setUseOrgName(p.getUseOrgName());
+                                    pushFundHistories.add(pushFundHistory);
                                 }
                                 Q1 = Q1.subtract(temp);
                             } else if (Q1.compareTo(BigDecimal.ZERO) == 0) {
@@ -6314,6 +6336,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setFund(B1);
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
+                                    //生成资金占用费计提记录
+                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    pushFundHistory.setCreateBySid(userSid);
+                                    pushFundHistory.setFund(B1);
+                                    pushFundHistory.setBusVinSid(p.getBusVinSid());
+                                    pushFundHistory.setIsEnable(3);
+                                    pushFundHistory.setUseOrgSid(p.getUseOrgSid());
+                                    pushFundHistory.setUseOrgName(p.getUseOrgName());
+                                    pushFundHistories.add(pushFundHistory);
                                 }
                                 Q1 = Q1.subtract(temp);
                             } else if (Q1.compareTo(BigDecimal.ZERO) == 0) {
@@ -6402,6 +6433,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 fundDay.setFund(B);
                                 fundDay.setBusSid(plan.getSid());
                                 loanFundDays.add(fundDay);
+                                //生成资金占用费计提记录
+                                LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                pushFundHistory.setCreateBySid(userSid);
+                                pushFundHistory.setFund(B);
+                                pushFundHistory.setBusVinSid(plan.getBusVinSid());
+                                pushFundHistory.setIsEnable(3);
+                                pushFundHistory.setUseOrgSid(plan.getUseOrgSid());
+                                pushFundHistory.setUseOrgName(plan.getUseOrgName());
+                                pushFundHistories.add(pushFundHistory);
                             }
                             if (pd) {
                                 planDetails.add(plan);
@@ -6546,6 +6586,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setFund(B1);
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
+                                    //生成资金占用费计提记录
+                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    pushFundHistory.setCreateBySid(userSid);
+                                    pushFundHistory.setFund(B1);
+                                    pushFundHistory.setBusVinSid(p.getBusVinSid());
+                                    pushFundHistory.setIsEnable(3);
+                                    pushFundHistory.setUseOrgSid(p.getUseOrgSid());
+                                    pushFundHistory.setUseOrgName(p.getUseOrgName());
+                                    pushFundHistories.add(pushFundHistory);
                                 }
                                 Q1 = Q1.subtract(temp);
                             } else if (Q1.compareTo(BigDecimal.ZERO) == 0) {
@@ -6665,6 +6714,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                     fundDay.setFund(B1);
                                     fundDay.setBusSid(p.getSid());
                                     loanFundDays.add(fundDay);
+                                    //生成资金占用费计提记录
+                                    LoanPushFundHistory pushFundHistory  = new LoanPushFundHistory();
+                                    pushFundHistory.setCreateBySid(userSid);
+                                    pushFundHistory.setFund(B1);
+                                    pushFundHistory.setBusVinSid(p.getBusVinSid());
+                                    pushFundHistory.setIsEnable(3);
+                                    pushFundHistory.setUseOrgSid(p.getUseOrgSid());
+                                    pushFundHistory.setUseOrgName(p.getUseOrgName());
+                                    pushFundHistories.add(pushFundHistory);
                                 }
                                 Q1 = Q1.subtract(temp);
                             } else if (Q1.compareTo(BigDecimal.ZERO) == 0) {
@@ -6705,6 +6763,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         if (loanFundDays.size() > 0 && !loanFundDays.isEmpty()) {
             loanFundDayService.saveList(loanFundDays);
         }
+        if (pushFundHistories.size() > 0 && !pushFundHistories.isEmpty()) {
+            loanPushFundHistoryService.saveList(pushFundHistories);
+        }
         if (jrList.size() > 0 && !jrList.isEmpty()) {
             finUncollectedReceivablesDetailedJRFeign.saveList(jrList);
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue

@@ -173,8 +173,10 @@ export default {
       this.viewTitle = '【编辑】专项返利分配申请'
       console.log('编辑回显', row.sid)
       req.fetchDetailsBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
-        this.formobj.instanceId = resp.data.procInstId
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
+        }
       }).catch((e) => {
         this.formobj = row
       })
@@ -233,36 +235,31 @@ export default {
             estimateRebate: e.estimateRebate,
             uploadMoney: e.uploadMoney,
             disNum: e.disNum,
-            unitSetAllocationMoney: (parseInt(e.uploadMoney)) / (parseInt(e.disNum))
+            unitSetAllocationMoney: Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100
           })
         })
       }
     },
     changeBrand(value) {
-      let bb = null
-      this.brand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.brandSid = bb.sid
+      const choose = this.brand_list.filter((item) => item.brandName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.brandSid = choose[0].sid
+      } else {
+        this.formobj.brandSid = ''
+      }
     },
     saveOrUpdate() {
-      console.log(this.formobj)
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.scmSpecialrebatedistributedetails.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((resp) => {
             this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
@@ -274,24 +271,24 @@ export default {
       })
     },
     submitVehicleApply() {
-      if (this.formobj.scmSpecialrebatedistributedetails.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' })
-        return
-      }
-      req.submitVehicleApply(this.formobj).then((res) => {
-        if (res.success) {
-          this.$message({
-            showClose: true,
-            type: 'success',
-            message: '提交成功'
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          if (this.formobj.scmSpecialrebatedistributedetails.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' })
+            return
+          }
+          this.submitdisabled = true
+          req.submitVehicleApply(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
           })
-          this.handleReturn('true')
         } else {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '提交失败'
-          })
+          return false
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue

@@ -100,7 +100,9 @@ export default {
       this.viewTitle = '专项返利分配申请详情'
       console.log('编辑回显', row.sid)
       req.fetchDetailsBySid(row.sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = row
       })

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue

@@ -104,7 +104,7 @@ import req from '@/api/specialrebate/specialrebatedistribution'
 import selectvehicle from './relation/selectvehicle.vue'
 
 export default {
-  name: 'specialrebatetobeallocatedAdd',
+  name: 'SpecialrebatetobeallocatedAdd',
   components: {
     selectvehicle
   },
@@ -162,7 +162,7 @@ export default {
       this.viewState = 1
       if (value.length > 0) {
         this.formobj.setNumber = value.length
-        this.formobj.unitSetAllocationMoney = (parseInt(this.formobj.allocationMoney)) / (parseInt(this.formobj.setNumber))
+        this.formobj.unitSetAllocationMoney = Math.round((parseFloat(this.formobj.allocationMoney) / parseFloat(this.formobj.setNumber)) * 100) / 100
         value.forEach((e) => {
           this.formobj.scmSpecialrebateVehsVehSidAndVinNos.push({
             modelName: e.modelName,
@@ -184,11 +184,7 @@ export default {
           req.save(this.formobj).then((resp) => {
             this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue

@@ -173,7 +173,9 @@ export default {
       this.viewTitle = '专项返利分配申请详情'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = {}
       })

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue

@@ -153,8 +153,10 @@ export default {
       this.viewTitle = '【编辑】专项返利分配申请'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
-        this.formobj = resp.data
-        this.formobj.instanceId = resp.data.procInstId
+        if (resp.success) {
+          this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
+        }
       }).catch((e) => {
         this.formobj = {}
       })
@@ -213,36 +215,27 @@ export default {
             estimateRebate: e.estimateRebate,
             uploadMoney: e.uploadMoney,
             disNum: e.disNum,
-            unitSetAllocationMoney: (parseInt(e.uploadMoney)) / (parseInt(e.disNum))
+            unitSetAllocationMoney: Math.round((parseInt(e.uploadMoney) / parseInt(e.disNum)) * 100) / 100
           })
         })
       }
     },
     changeBrand(value) {
-      let bb = null
-      this.brand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.brandSid = bb.sid
+      const choose = this.brand_list.filter((item) => item.brandName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.brandSid = choose[0].sid
+      } else {
+        this.formobj.brandSid = ''
+      }
     },
     saveOrUpdate() {
-      console.log(this.formobj)
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((resp) => {
             this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               // 子页面向父级页面传递值(关闭弹框)
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -261,27 +254,27 @@ export default {
       })
     },
     submitVehicleApply() {
-      req.submitVehicleApply(this.formobj).then((res) => {
-        if (res.success) {
-          this.$message({
-            showClose: true,
-            type: 'success',
-            message: '提交成功'
-          })
-          // 子页面向父级页面传递值(关闭弹框)
-          window.parent.postMessage({
-            cmd: 'returnHeight',
-            params: {
-              // 操作成功，告诉父级页面关闭弹框
-              code: 1
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submitVehicleApply(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
             }
-          }, '*')
-        } else {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '提交失败'
+          }).catch(() => {
+            this.submitdisabled = false
           })
+        } else {
+          return false
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue

@@ -136,7 +136,9 @@ export default {
       this.viewTitle = '专项返利分配申请详情'
       console.log('编辑回显', sid)
       req.fetchDetailsBySid(sid).then((resp) => {
-        this.formobj = resp.data
+        if (resp.success) {
+          this.formobj = resp.data
+        }
       }).catch((e) => {
         this.formobj = {}
       })

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

@@ -148,7 +148,8 @@
             "sourceBillNo": "",
             "userSid": "",
             "orgPath": "",
-            "menuUrl": ""
+            "menuUrl": "",
+            'warehouseTypeKey': "02"
           }
         },
         sids: [],
@@ -286,15 +287,18 @@
           size: 10,
           total: 0,
           params: {
-            name: '',
-            billNo: "",
-            sourceBillNo: "",
-            createTimestart: '',
-            createTimeEnd: '',
-            billstate: '',
-            menuUrl: '',
-            orgPath: '',
-            usersid: ""
+            "deptNmae": "",
+            "createByName": "",
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "finishStartTime": "",
+            "finishEndTime": "",
+            "sourceBillNo": "",
+            "userSid": "",
+            "orgPath": "",
+            "menuUrl": "",
+            'warehouseTypeKey': "02"
           }
         }
         this.loadList()

yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue

@@ -130,7 +130,9 @@
           "businessKey": "14",
           "businessValue": "盘亏出库",
           "remarks": "",
-          "goodsList": []
+          "warehouseTypeKey": "02",
+          "warehouseTypeValue": "旧件库",
+          "goodsList": [],
         },
         hideUploadBtn: false,
         sourceBillNoList: [],
@@ -170,7 +172,8 @@
         })
         req.getSourceBillNoBySid({
           deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-            'defaultOrgPath').lastIndexOf('/') + 1)
+            'defaultOrgPath').lastIndexOf('/') + 1),
+          warehouseTypeKey: "02"
         }).then((resp) => {
           if (resp.success) {
             this.sourceBillNoList = resp.data
@@ -269,6 +272,8 @@
           "businessKey": "14",
           "businessValue": "盘亏出库",
           "remarks": "",
+          "warehouseTypeKey": "02",
+          "warehouseTypeValue": "旧件库",
           "goodsList": []
         }
         this.submitdisabled = false
@@ -298,6 +303,9 @@
                 .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
               this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
                 .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+              this.formobj.warehouseTypeKey = "02"
+              this.formobj.warehouswarehouseTypeValueeTypeKey = "旧件库"
+
 
             }
           })

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

@@ -149,7 +149,8 @@
             "sourceBillNo": "",
             "userSid": "",
             "orgPath": "",
-            "menuUrl": ""
+            "menuUrl": "",
+            'warehouseTypeKey': "02"
           }
         },
         sids: [],
@@ -293,7 +294,8 @@
             "sourceBillNo": "",
             "userSid": "",
             "orgPath": "",
-            "menuUrl": ""
+            "menuUrl": "",
+            'warehouseTypeKey': "02"
           }
         }
         this.loadList()

yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue

@@ -144,6 +144,8 @@
           "businessKey": "04",
           "businessValue": "盘盈入库",
           "remarks": "",
+          "warehouseTypeKey": "02",
+          "warehouseTypeValue": "旧件库",
           "goodsList": []
         },
         hideUploadBtn: false,
@@ -195,7 +197,8 @@
 
         req.getSourceBillNoBySid({
           deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-            'defaultOrgPath').lastIndexOf('/') + 1)
+            'defaultOrgPath').lastIndexOf('/') + 1),
+          warehouseTypeKey: "02"
         }).then((resp) => {
           if (resp.success) {
             this.sourceBillNoList = resp.data
@@ -313,6 +316,8 @@
           "businessKey": "04",
           "businessValue": "盘盈入库",
           "remarks": "",
+          "warehouseTypeKey": "02",
+          "warehouseTypeValue": "旧件库",
           "goodsList": []
         }
         this.submitdisabled = false
@@ -343,6 +348,9 @@
               this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
                 .getItem('defaultOrgPath').lastIndexOf('/') + 1)
 
+              this.formobj.warehouseTypeKey = "02"
+              this.formobj.warehouswarehouseTypeValueeTypeKey = "旧件库"
+
             }
           })
           .catch(e => {

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

@@ -148,7 +148,8 @@
             "sourceBillNo": "",
             "userSid": "",
             "orgPath": "",
-            "menuUrl": ""
+            "menuUrl": "",
+            "warehouseTypeKey": "01"
           }
         },
         sids: [],
@@ -286,15 +287,18 @@
           size: 10,
           total: 0,
           params: {
-            name: '',
-            billNo: "",
-            sourceBillNo: "",
-            createTimestart: '',
-            createTimeEnd: '',
-            billstate: '',
-            menuUrl: '',
-            orgPath: '',
-            usersid: ""
+            "deptNmae": "",
+            "createByName": "",
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "finishStartTime": "",
+            "finishEndTime": "",
+            "sourceBillNo": "",
+            "userSid": "",
+            "orgPath": "",
+            "menuUrl": "",
+            "warehouseTypeKey": "01"
           }
         }
         this.loadList()

yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue

@@ -130,6 +130,8 @@
           "businessKey": "14",
           "businessValue": "盘亏出库",
           "remarks": "",
+          "warehouseTypeKey": "01",
+          "warehouseTypeValue": "配件库",
           "goodsList": []
         },
         hideUploadBtn: false,
@@ -170,7 +172,8 @@
         })
         req.getSourceBillNoBySid({
           deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-            'defaultOrgPath').lastIndexOf('/') + 1)
+            'defaultOrgPath').lastIndexOf('/') + 1),
+          warehouseTypeKey: "01"
         }).then((resp) => {
           if (resp.success) {
             this.sourceBillNoList = resp.data
@@ -269,6 +272,8 @@
           "businessKey": "14",
           "businessValue": "盘亏出库",
           "remarks": "",
+          "warehouseTypeKey": "01",
+          "warehouseTypeValue": "配件库",
           "goodsList": []
         }
         this.submitdisabled = false
@@ -299,6 +304,8 @@
               this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
                 .getItem('defaultOrgPath').lastIndexOf('/') + 1)
 
+              this.formobj.warehouseTypeKey = "01"
+              this.formobj.warehouswarehouseTypeValueeTypeKey = "配件库"
             }
           })
           .catch(e => {

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

@@ -149,7 +149,8 @@
             "sourceBillNo": "",
             "userSid": "",
             "orgPath": "",
-            "menuUrl": ""
+            "menuUrl": "",
+            "warehouseTypeKey": "01"
           }
         },
         sids: [],
@@ -293,7 +294,8 @@
             "sourceBillNo": "",
             "userSid": "",
             "orgPath": "",
-            "menuUrl": ""
+            "menuUrl": "",
+            "warehouseTypeKey": "01"
           }
         }
         this.loadList()

yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue

@@ -144,6 +144,8 @@
           "businessKey": "04",
           "businessValue": "盘盈入库",
           "remarks": "",
+          "warehouseTypeKey": "01",
+          "warehouseTypeValue": "配件库",
           "goodsList": []
         },
         hideUploadBtn: false,
@@ -195,7 +197,8 @@
 
         req.getSourceBillNoBySid({
           deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-            'defaultOrgPath').lastIndexOf('/') + 1)
+            'defaultOrgPath').lastIndexOf('/') + 1),
+          warehouseTypeKey: "01"
         }).then((resp) => {
           if (resp.success) {
             this.sourceBillNoList = resp.data
@@ -313,6 +316,8 @@
           "businessKey": "04",
           "businessValue": "盘盈入库",
           "remarks": "",
+          "warehouseTypeKey": "01",
+          "warehouseTypeValue": "配件库",
           "goodsList": []
         }
         this.submitdisabled = false
@@ -343,6 +348,9 @@
               this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
                 .getItem('defaultOrgPath').lastIndexOf('/') + 1)
 
+              this.formobj.warehouseTypeKey = "01"
+              this.formobj.warehouswarehouseTypeValueeTypeKey = "配件库"
+
             }
           })
           .catch(e => {