Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/api/home/index.ts

@@ -41,7 +41,7 @@ export const getPurchasereturnRecordMonth = async (params) => {
 
 // 本月索赔明细
 export const getPurchaseclaimRecordMonth = async (params) => {
-  return await request.get({ url: `/wms/index/pagePurchaseclaimRecordMonth`,params })
+  // return await request.get({ url: `/wms/index/pagePurchaseclaimRecordMonth`,params })
 }
 
 // 今日生产计划

src/api/wms/customerStatementDetail/index.ts

@@ -116,3 +116,8 @@ export const exportCustomerStatementCompareDetail = async (params) => {
 export const updateAdjustmentAmount = async (id: number, masterId: number, amount: number) => {
   return await request.get({ url: `wms/customer-tool-apport-statement-detail/updateAdjustmentAmount?id=` + id + '&masterId=' + masterId + '&amount=' + amount })
 }
+
+// 客户对账单直接创建开票申请查询子分页数据
+export const pageInvoice = async (params) => {
+  return await request.get({ url: `/wms/customer-statement-detail/pageInvoice`, params })
+}

src/api/wms/customerStatementMain/index.ts

@@ -127,9 +127,6 @@ export const exportCustomerStatementShareMain = async (params) => {
 export const getCustomerStatementMain = async (id: number) => {
   return await request.get({ url: `/wms/customer-statement-main/get?id=` + id })
 }
-// 客户对账单直接创建开票申请查询子分页数据
-export const pageInvoice = async (params) => {
-  return await request.get({ url: `/wms/customer-statement-detail/pageInvoice`, params })
-}
+
 
 

src/api/wms/switch/index.ts

@@ -57,5 +57,5 @@ export const importTemplate = () => {
 
 // 获取开关详情
 export const getSwitchByCode = async (code) => {
-  return await request.get({ url: '/wms/switch/getByCode?code=' + code })
+  // return await request.get({ url: '/wms/switch/getByCode?code=' + code })
 }

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -52,8 +52,22 @@
           <el-row key="规则条件row">
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="'规则条件row'+index">
               <!-- 受入地 -->
-              <el-form-item key="受入地formItem" label="受入地" class="err-120" v-if="index==0">
-                <el-select key="受入地Operator"
+              <el-form-item key="仓库和库区formItem" label="" label-width="0" v-if="index==0">
+                 <el-select key="仓库和库区"
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouseArea"
+                  :disabled="formData.name=='默认规则'&&formType=='update'"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.warehouseAreaOptions"
+                    :key="'仓库和库区'+cur.value"
+                  />
+                </el-select>
+                <el-select key="仓库和库区Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -64,10 +78,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.WarehouseCodeRangeOptions"
-                    :key="'受入地Operator'+cur.value"
+                    :key="'仓库和库区Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="受入地Value" style="flex:1" placeholder="请选择受入地"  v-model="item.Value" @blur="blurWarehouseByCodes">
+                <el-input key="仓库和库区Value" style="flex:1" placeholder="请选择仓库或者库区"  v-model="item.Value" @blur="blurWarehouseByCodes">
                   <template #suffix>
                     <el-button :disabled="formData.name=='默认规则'&&formType=='update'" type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                       <Icon icon="ep:search" class="mr-5px" /> 
@@ -186,6 +200,10 @@ import { validateHanset } from '@/utils/validator'
 
 import * as WarehouseApi from '@/api/wms/warehouse'
 import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as DockApi from '@/api/wms/dock'
@@ -261,6 +279,11 @@ const formatRangeOptions = (...rest) => {
 }
 // 下拉框列表集合
 const options = reactive({
+  // 仓库和库区下拉列表
+  warehouseAreaOptions: [
+    {value: 'WarehouseCode', label: '仓库' },
+    {value: 'Area', label: '库区' }
+  ],
   // 供应商范围下拉框列表
   WarehouseCodeRangeOptions: formatRangeOptions('IN', 'NOT IN'),
   // 供应商范围下拉框列表
@@ -438,6 +461,8 @@ const resetForm = () => {
 const searchTableRef = ref()
 // 仓库
 const searchWarehouse = () => {
+  console.log(WarehouseCodeOrArea.value)
+  if (WarehouseCodeOrArea.value == 'WarehouseCode') {
       searchTableRef.value.open(
       '请选择仓库',
       Warehouse.allSchemas,
@@ -449,6 +474,20 @@ const searchWarehouse = ()=>{
       undefined,
       undefined
     )
+  } else if (WarehouseCodeOrArea.value == 'Area') {
+    searchTableRef.value.open(
+      '请选择库区',
+      Area.allSchemas,
+      AreaApi.getAreaPage,
+      'Area',
+      'code',
+      true,
+      undefined,
+      undefined,
+      undefined
+    )
+  }
+ 
 }
 // 选择供应商
 const searchSupplier = () => {
@@ -501,6 +540,11 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
       warehouseCodeObj.value.Value = val.map(item => (item['code'])).join(',')
       formData.value.configuration['DockCode']=''
     }
+  }else if (formField=='Area') {
+    let Area = formData.value.condition.find(item => item['ParamCode'] == 'Area')
+    if(Area){
+      Area.Value = val.map(item=>(item['code'])).join(',')
+    }
   }  else if (formField=='SupplierCode') {
     let SupplierCode = formData.value.condition.find(item => item['ParamCode'] == 'SupplierCode')
     if(SupplierCode){
@@ -530,14 +574,23 @@ const blurWarehouseByCodes = async ()=>{
         ].join(',')
         message.alert('代码' + str + '没有找到对应数据')
         WarehouseCode.Value = ''
+        formData.value.configuration.DockCode=''
+        formData.value.configuration.Receiver=''
+        formData.value.configuration.PhoneNumber=''
         return
       }
     } else {
       WarehouseCode.Value = ''
+      formData.value.configuration.DockCode=''
+      formData.value.configuration.Receiver=''
+      formData.value.configuration.PhoneNumber=''
       message.alert('暂无数据')
     }
   }else{
     WarehouseCode.Value = ''
+    formData.value.configuration.DockCode=''
+    formData.value.configuration.Receiver=''
+    formData.value.configuration.PhoneNumber=''
   }
 }
 // 供应商失去焦点
@@ -602,6 +655,21 @@ const blurDockCode = async () => {
 const OperatorChange = (e, item) => {
   item.ScreenOperator =  rangeOptions.find((item) =>item.value === e)?.screenValue
 }
+const WarehouseCodeOrArea = ref('WarehouseCode')
+// 选择客户还是承运商
+const changeWarehouseArea = (e) => {
+  formData.value.condition[0].Value = ''
+  WarehouseCodeOrArea.value = e
+  if (e == 'WarehouseCode') {
+        formData.value.configuration.DockCode=''
+        formData.value.configuration.Receiver=''
+        formData.value.configuration.PhoneNumber=''
+  } else if (e == 'Area') {
+    // getFormSupplierList()
+  }
+}
+  //  {value: 'WarehouseCode', label: '仓库' },
+  //   {value: 'Area', label: '库区' }
 </script>
 <style scoped lang="scss">
 .item {

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="fromBatch"
     :includeCollectionTable="true"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
@@ -203,7 +203,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'fromBatch') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -300,10 +300,10 @@ const getDefaultToLocationCode = async ()=>{
   })
   console.log('params',params)
   let res = await LocationApi.selectBusinessTypeToLocation(params)
-  console.log('获取到库位默认值',res)
- if(res&&res.list.length>0){
-  formRef.value.formRef.formModel["toLocationCode"] = res.list[0]['code']
- }
+ //  console.log('获取到库位默认值',res)
+ // if(res&&res.list.length>0){
+ //  formRef.value.formRef.formModel["toLocationCode"] = res.list[0]['code']
+ // }
 }
 const clearInput = (field, row, index) => {
   if(field=='supplierCode'){
@@ -316,8 +316,8 @@ const toManagementPrecision = ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      if(formField == 'fromPackingNumber'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+      if(formField == 'fromBatch'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
 
         const toLocationCode =formRef.formModel.toLocationCode//主数据选择的到库位代码
@@ -387,14 +387,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       if (formField == 'fromWarehouseCode') {
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromBatch')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromBatch')).tableForm.searchCondition.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromBatch')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -410,8 +410,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
+    if(formField == 'fromBatch') {
+      // setV['fromPackingNumber'] = val[0]['packingNumber']
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -605,14 +605,14 @@ const openForm =async (type: string, row?: number) => {
  * 详情 新增/编辑事件
  */
 const detailOpenForm = (type, row) => {
-    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))?.componentProps?.searchCondition.push({
           key: 'warehouseCode',
           value: fromWarehouseCodeMain.value,
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))?.componentProps?.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = fromWarehouseCodeMain.value
           }

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@@ -1108,16 +1108,33 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '从批次',
     field: 'fromBatch',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm:{
+      multiple:true,
       disabled:true,
       placeholder: '请选择从批次',
       valueFormat: 'YYYYMMDD',
       format: 'YYYYMMDD',
+      isInpuFocusShow: false, // 开启查询弹窗
+      searchListPlaceholder: '请选择从批次',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: BalanceShow.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
         disabled: true,
         valueFormat: 'YYYYMMDD',
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从批次',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: BalanceShow.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -1177,53 +1194,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       disabled: true
     }
   },
-  {
-    label: '供应商批次',
-    field: 'altBatch',
-    sort: 'custom',
-    isForm:false,
-    isSearch: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      multiple:true,
-      disabled:true,
-      isInpuFocusShow: false, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: BalanceShow.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: BalanceShow.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
-      }
-    }
-  },
   {
     label: '到包装号',
     field: 'toPackingNumber',
@@ -1270,13 +1240,13 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:true,
+        disabled:false,
         min: 0,
         precision: 6
       }
     },
     tableForm: {
-      disabled:true,
+      disabled:false,
       type: 'InputNumber',
       min: 0,
       precision: 6