diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml index f9f5d80..af5b747 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml @@ -7,6 +7,6 @@ WHERE record_time <![CDATA[<=]]> DATE_SUB(NOW(), INTERVAL #{day} DAY); </delete> <delete id="deleteByRows"> - CALL DeleteRowsIfNeeded(#{maxRowsToKeep}, #{maxRowsToDelete}); + CALL DeleteRowsIfNeeded(#{maxRowsToKeep}, #{maxRowsToDelete}) </delete> </mapper> diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 10ccd14..63ad1ab 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -123,10 +123,10 @@ <el-form-item label="物料规格"> <el-input v-model="form.material_spec" style="width: 240px;" disabled /> </el-form-item> - <el-form-item label="计划数量" prop="plan_qty" > + <el-form-item label="计划数量" prop="plan_qty"> <el-input-number - :disabled="form.region_code === 'FJ'" v-model.number="form.plan_qty" + :disabled="form.region_code === 'FJ'" :min="0" style="width: 240px;" /> @@ -485,7 +485,8 @@ const defaultForm = { custer_no: null, pack_method: null, order_subnum: 0, - guadansum: 0 + guadansum: 0, + show: false } export default { name: 'PdmBdWorkorder', @@ -640,9 +641,14 @@ export default { }, // 下发 submits(row) { + this.crud.loading = true crudPdmBdWorkorder.submits(row).then(res => { this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() + }).catch(() => { + this.crud.loading = false + }).finally(() => { + this.crud.loading = false }) }, synchronize() {