#增加弃车功能

Junjie

2024-08-01 a073250f6f4f8c32888bc60b24ff6984e29af51e

#增加弃车功能

 src/main/java/com/zy/asrs/controller/WrkMastController.java

@@ -15,6 +15,7 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -245,5 +246,24 @@
        return R.ok();
    }

    @GetMapping(value = "/wrkMast/removeShuttle/{wrkNo}")
    @ManagerAuth(memo = "弃车")
    public R redPri(@PathVariable Integer wrkNo) {
        WrkMast wrkMast = wrkMastService.selectById(wrkNo);
        if (wrkMast == null) {
            return R.error("工作档不存在");
        }

        if (wrkMast.getShuttleNo() == null) {
            return R.error("工作档无小车");
        }

        wrkMast.setShuttleNo(null);
        if (!wrkMastService.updateById(wrkMast)) {
            return R.error("弃车失败");
        }
        return R.ok();
    }


}

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
@@ -69,7 +70,7 @@
     * 穿梭车
     */
    @ApiModelProperty(value= "穿梭车")
    @TableField("shuttle_no")
    @TableField(value = "shuttle_no",strategy = FieldStrategy.IGNORED)
    private Integer shuttleNo;

    /**

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -387,6 +387,27 @@
                    }
                });
                break;
            //弃车
            case 'removeShuttle':
                wrkNo = data.wrkNo;
                $.ajax({
                    url: baseUrl+"/wrkMast/removeShuttle/" + wrkNo,
                    headers: {'token': localStorage.getItem('token')},
                    contentType:'application/json;charset=UTF-8',
                    method: 'get',
                    success: function (res) {
                        layer.closeAll();
                        if (res.code === 200){
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(res.msg);
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        } else {
                            layer.msg(res.msg)
                        }
                    }
                })
                break;
        }
    });


 src/main/webapp/views/wrkMast/wrkMast.html

@@ -121,6 +121,7 @@
            <li><a lay-event="cancel">取消</a></li>
            <li><a lay-event="shuttleCommand">穿梭车指令</a></li>
            <li><a lay-event="liftCommand">提升机指令</a></li>
            <li><a lay-event="removeShuttle">弃车</a></li>
        </ul>
    </div>
</script>