Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -602,8 +602,12 @@ export default {
       }
     },
     handleSelect() {
-      this.viewState = 8
-      this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid)
+      if (this.formobj.payCompanySid !== '') {
+        this.viewState = 8
+        this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid, this.formobj.payCompanySid)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请先选择付款单位' })
+      }
     },
     deleteEve(index) {
       this.formobj.eveList.splice(index, 1)

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue

@@ -68,6 +68,7 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
+          payCompanySid: '',
           useOrgSid: '',
           sidList: []
         },
@@ -131,8 +132,9 @@ export default {
         }
       })
     },
-    showData(value, createOrgSid) {
+    showData(value, createOrgSid, payCompanySid) {
       this.listQuery.params.useOrgSid = createOrgSid
+      this.listQuery.params.payCompanySid = payCompanySid
       const aa = []
       // if (value.length > 0) {
       //   for (var i = 0; i < value.length; i++) {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -593,8 +593,12 @@ export default {
       }
     },
     handleSelect() {
-      this.viewState = 8
-      this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid)
+      if (this.formobj.payCompanySid !== '') {
+        this.viewState = 8
+        this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid, this.formobj.payCompanySid)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请先选择付款单位' })
+      }
     },
     deleteEve(index) {
       this.formobj.eveList.splice(index, 1)

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue

@@ -68,6 +68,7 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
+          payCompanySid: '',
           useOrgSid: '',
           sidList: []
         },
@@ -131,8 +132,9 @@ export default {
         }
       })
     },
-    showData(value, createOrgSid) {
+    showData(value, createOrgSid, payCompanySid) {
       this.listQuery.params.useOrgSid = createOrgSid
+      this.listQuery.params.payCompanySid = payCompanySid
       const aa = []
       // if (value.length > 0) {
       //   for (var i = 0; i < value.length; i++) {

yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue

@@ -149,8 +149,8 @@
             </el-table-column>
             <el-table-column label="库位" align="center" width="180">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.warehouseRackCode" clearable placeholder="请选择" @focus="getWarehouseRackList(scope.row.wareZoneSid)" @change="selectWarehouseAreaCode(scope.row,$event)">
-                  <el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.areaCode" :value="item.sid"/>
+                <el-select v-model="scope.row.warehouseRackCode" clearable placeholder="请选择" @focus="getWarehouseRackList(scope.row.wareAreaSid)" @change="selectWarehouseAreaCode(scope.row,$event)">
+                  <el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackCode" :value="item.rackCode"/>
                 </el-select>
               </template>
             </el-table-column>
@@ -285,8 +285,8 @@ export default {
         row.warehouseName = ''
         row.warehouseSid = ''
       }
-      row.WareZoneName = ''
-      row.WareZoneSid = ''
+      row.wareZoneName = ''
+      row.wareZoneSid = ''
       row.wareAreaName = ''
       row.wareAreaSid = ''
       row.warehouseRackCode = ''
@@ -302,11 +302,11 @@ export default {
     selectWareZoneName(row, val) {
       const choose = this.warehouseZoneList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
-        row.WareZoneName = choose[0].zoneName
-        row.WareZoneSid = choose[0].sid
+        row.wareZoneName = choose[0].zoneName
+        row.wareZoneSid = choose[0].sid
       } else {
-        row.WareZoneName = ''
-        row.WareZoneSid = ''
+        row.wareZoneName = ''
+        row.wareZoneSid = ''
       }
       row.wareAreaName = ''
       row.wareAreaSid = ''
@@ -340,9 +340,9 @@ export default {
       })
     },
     selectWarehouseAreaCode(row, val) {
-      const choose = this.warehouseRackList.filter((item) => item.sid === val)
+      const choose = this.warehouseRackList.filter((item) => item.rackCode === val)
       if (choose !== null && choose.length > 0) {
-        row.warehouseRackCode = choose[0].areaCode
+        row.warehouseRackCode = choose[0].rackCode
         row.warehouseRackSid = choose[0].sid
       } else {
         row.warehouseRackCode = ''

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

@@ -433,7 +433,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         recordDto.setCost(goodsPrice.toString());
                         recordDto.setAmount(goodsPrice.multiply(count).toString());
                         wmsInventoryRecordFeign.save(recordDto);
+                        wmsInventoryFeign.updateInventoryCount(countQuery);
                     } else if (busTypeKey.equals("1")) {
+                        //判断所选库位，是否存在该goodsId记录，如果有增加库存，如果没有新增库存记录。
+
                         //维修退库
                         countQuery.setAddOrReduce(0);
                         WmsInventoryRecordDto recordDto = new WmsInventoryRecordDto();
@@ -460,8 +463,9 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         recordDto.setCost(goodsPrice.toString());
                         recordDto.setAmount(goodsPrice.multiply(count).toString());
                         wmsInventoryRecordFeign.save(recordDto);
+                        wmsInventoryFeign.updateInventoryCount(countQuery);
                     }
-                    wmsInventoryFeign.updateInventoryCount(countQuery);
+
                 }
 
             }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java

@@ -7,5 +7,6 @@ public class RackVo {
 
     String rackName;
     String rackCode;
+    String sid;
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml

@@ -66,6 +66,7 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} and isDelete=0
     </select>
     <select id="getAllRackByKQSid" resultType="com.yxt.wms.biz.base.wmswarehouserack.RackVo">
         SELECT
+               sid,
             rackName,
             rackCode
         FROM wms_warehouse_rack