13

zhang

2 小时以前 55eb3d480594f4c0dd382eaeeb8548bf911d6ad7

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

@@ -10,16 +10,15 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,7 +33,7 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private BasWhsService basWhsService;
    private BasWhsTypeService basWhsService;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -66,8 +65,6 @@
        excludeTrash(param);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
@@ -205,7 +202,7 @@
    public R init(LocMastInitParam param) {
        try {
            List<LocMast> list = new ArrayList<>();
            BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
            BasWhsType basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
            if (Cools.isEmpty(basWhs)) {
                return R.error("库型不存在！！！");
            }