1

wankeda

2025-04-15 99d9d4ed78eeb7b59c5c2ce314a82765f08a600a

1

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/pages/½ÐÁÏ/Õý¼«½ÐÁÏ.vue

@@ -179,12 +179,12 @@
                                this.$refs.popup.close();
                                // this.submit();
                            } else {
                                this.$t.message.toast(res.msg);
                                this.$t.message.toast(res.message);
                            }
                        });
                        // this.submit();
                    } else {
                        this.$t.message.toast(res.msg);
                        this.$t.message.toast(res.message);
                    }
                }).catch((err) => {
                    this.$t.message.toast(err.message);

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/pages/½ÐÁÏ/¸º¼«½ÐÁÏ.vue

@@ -199,12 +199,12 @@
                                this.$refs.popup.close();
                                // this.submit();
                            } else {
                                this.$t.message.toast(res.msg);
                                this.$t.message.toast(res.message);
                            }
                        });
                        // this.submit();
                    } else {
                        this.$t.message.toast(res.msg);
                        this.$t.message.toast(res.message);
                    }
                }).catch((err) => {
                    this.$t.message.toast(err.message);

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_PDA/pages/½ÐÁÏ/ÊäËÍÏß»ØÁ÷.vue

@@ -3,17 +3,25 @@
        <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem">
        </uni-segmented-control>
        <view class="content">
        <view v-if="current === 0" class="headerstyle">
            <view v-if="current === 0" class="headerstyle">
                <view class="itemstyle">
                    <uni-forms label-width="120">
                        <uni-forms-item label="起点地址">
                            <!-- <uni-easyinput type="text" :focus="!addressFocus" v-model="sourceAddress"
                                placeholder="请扫瞄起点地址" ref='midInput' @input="inputChangebarcode" /> -->
                                    <uni-data-select v-model="value" :localdata="rangs"></uni-data-select>
                            <uni-data-select v-model="value" :localdata="rangs"></uni-data-select>
                        </uni-forms-item>
                        <uni-forms-item label="终点地址">
                            <uni-easyinput type="text" :focus="!addressFocus" v-model="targetAddress"
                                placeholder="请扫描终点地址" ref='midInput' @input="inputChangebarcode" />
                        </uni-forms-item>
                        <uni-forms-item label="第一托盘条码">
                            <uni-easyinput type="text" :focus="!addressFocus" v-model="pallcode" placeholder="请扫描托盘条码"
                                ref='midInput' @input="inputChangebarcode" />
                        </uni-forms-item>
                        <uni-forms-item label="第二托盘条码">
                            <uni-easyinput type="text" :focus="!addressFocus" v-model="pallcode1" placeholder="请扫描托盘条码"
                                ref='midInput' @input="inputChangebarcode" />
                        </uni-forms-item>
                        <uni-forms-item>
                            <button @click="inbound" type="primary" size="default"
@@ -31,7 +39,7 @@
    const innerAudioContext = uni.createInnerAudioContext();
    export default {
        data() {
            return { 	
            return {
                items: ['输送线搬运'],
                current: 0,
                matTotal: [],
@@ -46,6 +54,9 @@
                addressFocus: false,
                targetAddress: "",
                sourceAddress: "",
                pallcode: "",
                pallcode1: "",
                Exception: "",
                address: "",
                check: true,
                value: "",
@@ -124,27 +135,48 @@
                })
            },
            inbound() {
                // æå–输入框的值
                const sourceAddress = this.value;
                const targetAddress = this.targetAddress;
                // æå–工单编号
                const pallcode =this.pallcode;
                // æå–型号
                const pallcode1 = this.pallcode1;
				
                if (sourceAddress == "") {
                    this.$t.message.toast('请选择起点位置');
                    return;
                }
                if (targetAddress == "") {
                    this.$t.message.toast('请扫瞄终点位置');
                    return;
                }
                if (pallcode == "") {
                    this.$t.message.toast('请扫描第一拖盘条码');
                    return;
                }
                if (pallcode1 == "") {
                    this.$t.message.toast('请扫描第二拖盘条码');
                    return;
                }
                var postData = {
                    MainData: {
                        "sourceAddress": this.value,
                        "targetAddress": this.targetAddress,
                        "Exception": this.pallcode + "," + this.pallcode1
                    }
                }

                // console.log(Exception);
                this.$u.post('/api/PDA/EmptyTask', postData).then(res => {
                    if (res.code == 200) {
                        uni.$showMsg("任务添加成功");
                        this.sourceAddress = "";
                        this.targetAddress = "";
                        setTimeout(() => {
                            // this.materialtype = false;
                        }, 200);
                    } else {
                        this.$refs.uToast.show({
                            title: res.message,
                            type: "error"
                        })
                    }
                this.$t.message.closeLoading();
                console.log(postData);
                if (res.code == 200) {
                    this.$t.message.toast('呼叫成功');
                    this.$refs.popup.close();
                    // this.submit();
                } else {
                    this.$t.message.toast(res.message);
                }
                }).catch(err => {
                    this.$refs.uToast.show({
                        title: err.message,

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs

@@ -88,7 +88,7 @@
            WebResponseContent response = new WebResponseContent();
            try
            {
                var czTask = BaseDal.QueryFirst(x => x.TaskTaskID == dto.TaskId);
                var czTask = BaseDal.QueryFirst(x => x.TaskTaskID == dto.TaskId && x.TaskStatus == TaskInStatusEnum.InNew.ToString());
                if (czTask == null)
                {
                    response.Error("任务不存在！");
@@ -162,7 +162,7 @@
            {
                string Saddress = saveModel.MainData["sourceAddress"].ToString();
                string Taddress = saveModel.MainData["targetAddress"].ToString();

                string Exception = saveModel.MainData["Exception"].ToString();
                Dt_Task task = _taskRepository.QueryFirst(x => x.SourceAddress == Saddress && x.TaskState == (int)TaskInStatusEnum.InPending && x.TargetAddress == "WaitBind");
                if (task == null)
                {
@@ -170,6 +170,7 @@
                    return Task.FromResult(webResponseContent);
                }
                task.TargetAddress = Taddress;
                task.ExceptionMessage = Exception;
                task.TaskState = (int)TaskInStatusEnum.InNew;
                var isTrue = _taskRepository.UpdateData(task);
                if (isTrue)

 ´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -66,8 +66,8 @@
                // å®šä¹‰çº¿ä½“实盘入库请求的地址和任务类型
                var requests = new Dictionary<string, string>
                {
                    { "DB1002.1093.0", "ZJXL-WLX002" },
                    { "DB1002.1493.0", "FJXL-WLX002" }
                    { "DB1002.693.0", "ZJXL-WLX002" },
                    { "DB1002.1093.0", "FJXL-WLX002" }
                };

                // å®šä¹‰çº¿ä½“空盘回流请求的地址和任务类型
@@ -121,7 +121,7 @@
                }

                // æŸ¥è¯¢ä»»åŠ¡ç±»åž‹å¯¹åº”çš„czTask
                DtCZTask czTask = _taskCZRepository.QueryFirst(x => x.TaskType == taskType);
                DtCZTask czTask = _taskCZRepository.QueryFirst(x => x.TaskType == taskType && x.TaskStatus == TaskInStatusEnum.InFinish.ToString());
                if (czTask == null)
                {
                    ConsoleHelper.WriteInfoLine($"{nameof(CommonConveyorLineJob)}: {taskType}{requestType},{taskType}任务不存在，稍后重试......");