diff --git a/ant-design-vue-jeecg/src/views/system/report/ReportInventoryTransactionList.vue b/ant-design-vue-jeecg/src/views/system/report/ReportInventoryTransactionList.vue
index 98875b6..7ed90ba 100644
--- a/ant-design-vue-jeecg/src/views/system/report/ReportInventoryTransactionList.vue
+++ b/ant-design-vue-jeecg/src/views/system/report/ReportInventoryTransactionList.vue
@@ -9,21 +9,21 @@
<a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="物料名称">
- <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="物料规格">
- <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="物料单位">
- <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
- </a-form-item>
- </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料名称">
+ <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料规格">
+ <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="物料单位">
+ <a-input placeholder="请输入物料单位" v-model="queryParam.materialUnit"></a-input>
+ </a-form-item>
+ </a-col>
<a-col :xl="12" :lg="14" :md="16" :sm="24">
<a-form-item label="创建日期">
<j-date :show-date="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间"
diff --git a/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue
index 8fa00af..77eb811 100644
--- a/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue
@@ -83,9 +83,18 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
-<!-- <a-button @click="createEmptyIn()" v-has="'taskHeader:emptyIn'" type="primary">空托入库</a-button>-->
-<!-- <a-button @click="createManyEmptyIn()" v-has="'taskHeader:manyEmptyIn'" type="primary">空托组入库</a-button>-->
-<!-- <a-button @click="openDemo()" type="primary">弹出demo</a-button>-->
+ <a-button v-has="'taskHeader:emptyIn'" @click="createEmptyIn()" type="primary">空托入库</a-button>
+ <a-button v-has="'taskHeader:manyEmptyIn'" @click="createManyEmptyIn()" type="primary">空托组入库</a-button>
+ <a-button v-has="'taskHeader:quickReceipt'" @click="quickReceipt()" type="primary">快速入库</a-button>
+ <a-button v-has="'taskHeader:callReceiptBox'" @click="callReceiptBox()" type="primary" >呼叫入库有货托盘</a-button>
+ <a-button v-has="'taskHeader:callReceiptBox'" @click="callReceiptEmptyBox()" type="primary" >呼叫入库空托盘</a-button>
+ <a-button v-has="'taskHeader:emptyOut'" @click="createEmptyOut()" type="primary">空托出库</a-button>
+ <a-button v-has="'taskHeader:manyEmptyOut'" @click="batchCreateEmptyOut()" type="primary">批量空托出库</a-button>
+ <a-button v-has="'taskHeader:manyEmptyOut'" @click="createManyEmptyOut()" type="primary">空托组出库</a-button>
+ <a-button v-has="'taskHeader:callShipmentBox'" @click="callShipmentBox()" type="primary" >呼叫出库托盘</a-button>
+ <a-button v-has="'taskHeader:checkOut'" @click="createCheckOut()" type="primary">出库查看</a-button>
+ <a-button v-has="'taskHeader:transfer'" @click="createTransfer()" type="primary">移库任务</a-button>
+ <a-button v-has="'taskHeader:overStation'" @click="createOverStation()" type="primary">跨站任务</a-button>
<j-super-query :fieldList="superFieldList" v-has="'taskHeader:superQuery'" @handleSuperQuery="handleSuperQuery"/>
<a-button v-has="'taskHeader:export'" type="primary" icon="download" @click="handleExportXls('任务表')">导出</a-button>
</div>
@@ -178,7 +187,18 @@
<taskHeader-modal ref="modalForm" @ok="modalFormOk"></taskHeader-modal>
<empty-in-task-modal ref="emptyInModal" @ok="modalFormOk"></empty-in-task-modal>
<many-empty-in-task-modal ref="manyEmptyInModal" @ok="modalFormOk"></many-empty-in-task-modal>
- <MaterialTaskModal ref="materialTaskModal"></MaterialTaskModal>
+ <MaterialTaskModal ref="materialTaskModal" @ok="modalFormOk"></MaterialTaskModal>
+ <call-receipt-box-modal ref="modalForm5" @ok="modalFormOk"></call-receipt-box-modal>
+ <call-receipt-empty-box-modal ref="modalForm6" @ok="modalFormOk"></call-receipt-empty-box-modal>
+
+ <empty-out-task-modal ref="emptyOutModal" @ok="modalFormOk"></empty-out-task-modal>
+ <batch-empty-out-task-modal ref="batchEmptyOutModal" @ok="modalFormOk"></batch-empty-out-task-modal>
+ <many-empty-out-task-modal ref="manyEmptyOutModal" @ok="modalFormOk"></many-empty-out-task-modal>
+ <call-shipment-box-modal ref="modalForm1" @ok="modalFormOk"></call-shipment-box-modal>
+ <check-out-task-modal ref="checkOutModal" @ok="modalFormOk"></check-out-task-modal>
+ <transfer-task-modal ref="transferModal" @ok="modalFormOk"></transfer-task-modal>
+ <over-station-task-modal ref="overStationModal" @ok="modalFormOk"></over-station-task-modal>
+
</a-card>
</template>
@@ -197,11 +217,24 @@ import EmptyInTaskModal from './modules/EmptyInTaskModal'
import ManyEmptyInTaskModal from "./modules/ManyEmptyInTaskModal";
import {filterObj} from "@/utils/util";
import MaterialTaskModal from "./modules/MaterialTaskModal";
+import CallReceiptBoxModal from "@views/system/task/modules/CallReceiptBoxModal.vue";
+import CallReceiptEmptyBoxModal from "@views/system/task/modules/CallReceiptEmptyBoxModal.vue";
+import BatchEmptyOutTaskModal from "@views/system/task/modules/BatchEmptyOutTaskModal.vue";
+import CallShipmentBoxModal from "@views/system/task/modules/CallShipmentBoxModal.vue";
+import EmptyOutTaskModal from "@views/system/task/modules/EmptyOutTaskModal.vue";
+import ManyEmptyOutTaskModal from "@views/system/task/modules/ManyEmptyOutTaskModal.vue";
+import CheckOutTaskModal from "@views/system/task/modules/CheckOutTaskModal.vue";
+import TransferTaskModal from "@views/system/task/modules/TransferTaskModal.vue";
+import OverStationTaskModal from "@views/system/task/modules/OverStationTaskModal.vue";
export default {
name: "AllTaskHeaderList",
mixins: [JeecgListMixin],
components: {
+ OverStationTaskModal, TransferTaskModal,
+ CheckOutTaskModal,
+ ManyEmptyOutTaskModal, EmptyOutTaskModal, CallShipmentBoxModal, BatchEmptyOutTaskModal,
+ CallReceiptEmptyBoxModal, CallReceiptBoxModal,
ManyEmptyInTaskModal,
EmptyInTaskModal,
TaskDetailList,
@@ -500,17 +533,53 @@ export default {
}
});
},
- // createEmptyIn() {
- // this.$refs.emptyInModal.edit();
- // this.$refs.emptyInModal.title = "创建空托盘入库";
- // },
- // createManyEmptyIn() {
- // this.$refs.manyEmptyInModal.edit();
- // this.$refs.manyEmptyInModal.title = "创建空托盘组入库";
- // },
- // openDemo(){
- // this.$refs.materialTaskModal.edit();
- // },
+ createEmptyIn() {
+ this.$refs.emptyInModal.edit();
+ this.$refs.emptyInModal.title = "创建空托盘入库";
+ },
+ createManyEmptyIn() {
+ this.$refs.manyEmptyInModal.edit();
+ this.$refs.manyEmptyInModal.title = "创建空托盘组入库";
+ },
+ quickReceipt(){
+ this.$refs.materialTaskModal.edit();
+ },
+ callReceiptBox() {
+ this.$refs.modalForm5.edit();
+ this.$refs.modalForm5.title = "呼叫入库有货托盘";
+ },
+ callReceiptEmptyBox() {
+ this.$refs.modalForm6.edit();
+ this.$refs.modalForm6.title = "呼叫入库空托盘";
+ },
+ createEmptyOut() {
+ this.$refs.emptyOutModal.edit();
+ this.$refs.emptyOutModal.title = "创建空托盘出库";
+ },
+ batchCreateEmptyOut() {
+ this.$refs.batchEmptyOutModal.edit();
+ this.$refs.batchEmptyOutModal.title = "批量创建空托盘出库";
+ },
+ createManyEmptyOut() {
+ this.$refs.manyEmptyOutModal.edit();
+ this.$refs.manyEmptyOutModal.title = "创建空托盘组出库";
+ },
+ callShipmentBox() {
+ this.$refs.modalForm1.edit();
+ this.$refs.modalForm1.title = "呼叫出库托盘";
+ },
+ createCheckOut() {
+ this.$refs.checkOutModal.edit();
+ this.$refs.checkOutModal.title = "创建出库查看任务";
+ },
+ createTransfer() {
+ this.$refs.transferModal.edit();
+ this.$refs.transferModal.title = "创建移库任务";
+ },
+ createOverStation() {
+ this.$refs.overStationModal.edit();
+ this.$refs.overStationModal.title = "创建跨站任务";
+ },
solutionZoneCode(value) {
var actions = []
Object.keys(this.zoneList).some((key) => {
diff --git a/ant-design-vue-jeecg/src/views/user/LoginAccount.vue b/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
index 653ddc1..018b1c7 100644
--- a/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
+++ b/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
@@ -7,8 +7,7 @@
</a-input>
</a-form-model-item>
<a-form-model-item required prop="password">
- <a-input v-model="model.password" size="large" type="text" autocomplete="off" @input="maskPassword"
- placeholder="请输入密码 / 123456" >
+ <a-input v-model="model.password" size="large" type="text" autocomplete="off" @input="maskPassword" placeholder="请输入密码" >
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-model-item>
@@ -105,14 +104,29 @@ export default {
},
maskPassword() {
- if (this.model.password.length<this.maskedPassword.length){
- let len=this.maskedPassword.length-this.model.password.length
- this.maskedPassword=this.maskedPassword.substring(0,this.maskedPassword.length - len)
- }else{
- this.maskedPassword = this.maskedPassword + this.model.password.substring(this.model.password.length - 1, this.model.password.length)
+ //获取输入框的值
+ let value = this.model.password
+ if (value != '') {
+ //如果不为空，逐个字符判断是否为圆点
+ for (let i = 0; i < value.length; i++) {
+ if (value.charAt(i) != '\u25CF') {
+ //如果不是圆点，表示该字符为用户输入的值，放到真实值的对应位置
+ let char = value.charAt(i)
+ this.maskedPassword = this.maskedPassword.slice(0, i) + char + this.maskedPassword.slice(i)
+ //将该字符替换为圆点
+ value = value.slice(0, i) + '\u25CF' + value.slice(i + 1)
+ }
+ }
+ //防止真实值和圆点的数量不对应。
+ this.maskedPassword = this.maskedPassword.slice(0, value.length)
+ //将转换过的字符串显示给用户
+ this.model.password = value
+ } else {
+ //保持一致性
+ this.maskedPassword = ''
}
- this.model.password = '*'.repeat(this.model.password.length);
},
+
// 判断登录类型
handleUsernameOrEmail(rule, value, callback) {
const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
index 91da70f..2f4f120 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
@@ -61,21 +61,21 @@ public class AutoDeleteTask implements Job {
LambdaQueryWrapper<ReceiptHeader> receiptHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
receiptHeaderLambdaQueryWrapper.eq(ReceiptHeader::getLastStatus, QuantityConstant.RECEIPT_HEADER_COMPLETED).isNull(ReceiptHeader::getReferCode);
List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(receiptHeaderLambdaQueryWrapper);
- log.info(String.format(" AutoDeleteReceiptTask 执行任务! receiptHeaderList :" + receiptHeaderList + "时间" + DateUtils.getTimestamp()));
+ log.info(String.format(" AutoDeleteTask 执行任务! receiptHeaderList :" + receiptHeaderList + "时间" + DateUtils.getTimestamp()));
for (ReceiptHeader receiptHeader : receiptHeaderList) {
receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
}
LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED).isNull(ShipmentHeader::getReferCode);
List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
- log.info(String.format(" AutoDeleteReceiptTask 执行任务! shipmentHeaderList :" + shipmentHeaderList + "时间" + DateUtils.getTimestamp()));
+ log.info(String.format(" AutoDeleteTask 执行任务! shipmentHeaderList :" + shipmentHeaderList + "时间" + DateUtils.getTimestamp()));
for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
shipmentHeaderService.delMain(String.valueOf(shipmentHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
}
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
- log.info(String.format(" AutoDeleteReceiptTask 执行任务! taskHeaderList :" + taskHeaderList + "时间" + DateUtils.getTimestamp()));
+ log.info(String.format(" AutoDeleteTask 执行任务! taskHeaderList :" + taskHeaderList + "时间" + DateUtils.getTimestamp()));
for (TaskHeader taskHeader : taskHeaderList) {
taskHeaderService.delMain(taskHeader.getId());
}