#

bfwms

2025-05-28 600dd1637244fb476c1373c390dfcf23ca26a948

#

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

@@ -10,7 +10,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasSteService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,8 @@

    @Autowired
    private BasSteService basSteService;
    @Autowired
    private WrkMastService wrkMastService;

    @RequestMapping(value = "/basSte/{id}/auth")
    @ManagerAuth
@@ -44,7 +48,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasSte.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basSteService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -74,6 +80,10 @@
        if (Cools.isEmpty(basSte) || null==basSte.getSteNo()){
            return R.error();
        }
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
        if (wrkMasts == null || wrkMasts.isEmpty()) {
            basSte.setPakMk("N");
        }
        basSteService.updateById(basSte);
        return R.ok();
    }

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

@@ -123,7 +123,7 @@
    public R query(String condition) {
        EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
        wrapper.like("wrk_desc", condition);
        Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 10), wrapper);
        Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 100), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasWrkStatus basWrkStatus : page.getRecords()){
            Map<String, Object> map = new HashMap<>();

 src/main/webapp/static/js/basSte/basSte.js

@@ -181,7 +181,7 @@
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            title: (mData ? '修改' : '添加') + '小车状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);

 src/main/webapp/views/basSte/basSte.html

@@ -104,6 +104,12 @@
                        <input class="layui-input" type="number" name="chargeLine" placeholder="请输入最低电量">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">标记: </label>
                    <div class="layui-input-block">
                        <input class="layui-input"  name="pakMk" placeholder="请输入标记">
                    </div>
                </div>

             </div>
        </div>