-
规则配置
+
{{t('ts.规则配置').replace('ts.','')}}
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index 9e358a5d5..b6b18e322 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -4,19 +4,19 @@
-
-
+
-
-
+
+
- 搜索
+ {{t('ts.搜索')}}
- 重置
+ {{t('ts.重置')}}
@@ -26,16 +26,16 @@
-
-
-
-
-
+
+
+
+
+
-
+
From 24adaca354f6c9c13cc4f981c975c77efa3d092f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 6 Aug 2024 12:00:56 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionJob/addForm.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 2a44e6eb0..6775e1ea5 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -1412,9 +1412,6 @@ const inspectionValueInput = (item, cur) => {
i++
) {
item.isPass = true
- item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit = false
- item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget = 10
- item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping = 10.1
// 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
if (
item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
From 33946a5da98b765742967960e5d8da70888e3e03 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 6 Aug 2024 13:03:16 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99?=
=?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productionscrapRequestMain/index.vue | 48 +++++++-------
.../productionscrapRequestMain.data.ts | 66 ++++++++++++++++---
2 files changed, 82 insertions(+), 32 deletions(-)
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 0ca2ebe15..c3496eea1 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -341,17 +341,17 @@ const butttondata = (row,$index) => {
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionscrap-request-main:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
// 创建标签
- {
- label: '创建标签',
- name: 'cjbq',
- hide: isShowMainButton(row,['3']),
- type: 'primary',
- icon: '',
- color: '',
- hasPermi: '',
- link: true, // 文本展现按钮
- },
- defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+ // {
+ // label: '创建标签',
+ // name: 'cjbq',
+ // hide: isShowMainButton(row,['3']),
+ // type: 'primary',
+ // icon: '',
+ // color: '',
+ // hasPermi: '',
+ // link: true, // 文本展现按钮
+ // },
+ // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
]
}
@@ -483,19 +483,19 @@ const buttonTableClick = async (val, row) => {
})
} else if (val == 'mainHandle') { // 处理
- // 判断 是否已创建标签
- let isCreateLabel = false
- await PackageApi.getPackagePage({
- requestNumber: row.number
- }).then(res => {
- if (res) {
- if (res.list.length > 0) isCreateLabel = true
- }
- })
- if (!isCreateLabel) {
- message.warning('请先创建标签')
- return
- }
+ // // 判断 是否已创建标签
+ // let isCreateLabel = false
+ // await PackageApi.getPackagePage({
+ // requestNumber: row.number
+ // }).then(res => {
+ // if (res) {
+ // if (res.list.length > 0) isCreateLabel = true
+ // }
+ // })
+ // if (!isCreateLabel) {
+ // message.warning('请先创建标签')
+ // return
+ // }
tableObject.loading = true
ProductionscrapRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 5f5c3248e..5acd62749 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -26,6 +26,9 @@ import { TableColumn } from '@/types/table'
import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+// import * as LocationApi from '@/api/wms/location'
+// import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -697,6 +700,53 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive
Date: Tue, 6 Aug 2024 14:50:13 +0800
Subject: [PATCH 5/7] =?UTF-8?q?HL-4929=20=20=E7=89=A9=E6=96=99=E5=8F=98?=
=?UTF-8?q?=E6=9B=B4=E5=88=B0=E5=BA=93=E4=BD=8D=E8=87=AA=E5=8A=A8=E8=B5=8B?=
=?UTF-8?q?=E5=80=BC=E4=BB=8E=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../relegate/relegateRequest/index.vue | 5 ++--
.../relegateRequestMain.data.ts | 25 ++++++-------------
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 51a9c00ee..c2f08f68a 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -187,6 +187,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
newRow['fromPackingNumber'] = item['packingNumber']
newRow['toBatch'] = item['batch']
newRow['fromLocationCode'] = item['locationCode']
+ newRow['toLocationCode'] = item['locationCode']
newRow['inventoryStatus'] = item['inventoryStatus']
newRow['packUnit'] = item['packUnit']
newRow['packQty'] = item['packQty']
@@ -227,9 +228,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
// console.log(row['itemCode']);
// ItembasicApi.getItemListByCodes(row['itemCode'])
row['downItemCode'] = val[0]['code']
- } else if (formField == 'toLocationCode') {
- row['toLocationCode'] = val[0]['code']
- } else {
+ } else {
row[formField] = val[0][searchField]
}
} else {
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 7d116d022..7d06ecb7e 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -491,28 +491,17 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([
label: '库位代码',
field: 'toLocationCode',
sort: 'custom',
- tableForm:{
- isInpuFocusShow: true, // 开启查询弹窗
- searchListPlaceholder: '请选择到库位代码',
- searchField: 'code',
- searchTitle: '库位信息',
- searchAllSchemas: Location.allSchemas,
- searchPage: LocationApi.selectBusinessTypeToLocation,
+ table: {
+ width: 100
+ },
+ tableForm: {
+ disabled: true
},
form: {
- // labelMessage: '信息提示说明！！！',
componentProps: {
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择到库位代码',
- searchField: 'code',
- searchTitle: '库位信息',
- searchAllSchemas: Location.allSchemas,
- searchPage: LocationApi.selectBusinessTypeToLocation,
+ disabled: true
}
- },
- table: {
- width: 120
- },
+ }
},
{
label: '到包装号',
From 792e07050c79122a05ad209fac9c48309cd6f597 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 6 Aug 2024 16:44:25 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=AF=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/business/inputBlur.ts | 34 ++++++++++---------
.../inventorymoveRequestMain.data.ts | 1 +
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 9fb2ca26e..0bd0e3d38 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -158,24 +158,26 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
}
}
}
- // 判断改包装号是否已经添加
- const seen = new Set()
- const repeatCode = new Set()
- const arr = tableData.map((item) => item[headerItem.field]?.trim())
- arr.forEach((item) => {
- if (item) {
- if (seen.has(item)) {
- repeatCode.add(item)
- } else {
- seen.add(item)
+ // 判断代码是否存在
+ if (!headerItem?.tableForm.isRepeat) {
+ const seen = new Set()
+ const repeatCode = new Set()
+ const arr = tableData.map((item) => item[headerItem.field]?.trim())
+ arr.forEach((item) => {
+ if (item) {
+ if (seen.has(item)) {
+ repeatCode.add(item)
+ } else {
+ seen.add(item)
+ }
}
+ })
+ const arr1 = Array.from(repeatCode)
+ if (arr1.length > 0) {
+ message.warning(`${arr1.join(',')}${t('ts.已经存在')}`)
+ row[headerItem.field] = ''
+ return
}
- })
- const arr1 = Array.from(repeatCode)
- if (arr1.length > 0) {
- message.warning(`${arr1.join(',')}${t('ts.已经存在')}`)
- row[headerItem.field] = ''
- return
}
if (filters.length > 0) {
params.value.isSearch = true
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 539a42f47..b90d7a7c3 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -709,6 +709,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
value: 'in',
isMainValue: false
}],
+ isRepeat:true,
verificationParams: [{
key: 'code',
action: '==',
From c92ff3a09203e36d5466dc95985e2b73cfe475c7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 6 Aug 2024 17:05:16 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E9=87=8D?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventorymove/inventorymoveRequestMain/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 32f943672..88f278275 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -701,8 +701,8 @@ const submitForm = async (formType, submitData) => {
data.subList = tableData.value // 拼接子表数据参数
let isExist = false
tableData.value.forEach(item => {
- let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) )
- console.log(rs,5666);
+ let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) )
+ console.log(rs,5666);
if(rs.length > 1) isExist = true
})
if (isExist) {
@@ -710,6 +710,7 @@ const submitForm = async (formType, submitData) => {
isExist = false
return message.warning('包装号重复')
}
+ flag.value = false
data.subList.forEach(item => {
console.log(556565,item);
if(fromInventoryStatus.value){