#

lty

4 天以前 dea586adf232c722e8d2dfa833c3d7711a1019df

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

@@ -9,10 +9,15 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.PackService;
import com.zy.asrs.service.TagService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.*;
@@ -22,6 +27,10 @@

    @Autowired
    private PackService packService;
    @Autowired
    private MatService matService;
    @Autowired
    private TagService tagService;

    @RequestMapping(value = "/pack/{id}/auth")
    @ManagerAuth
@@ -40,7 +49,7 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -60,21 +69,42 @@

    @RequestMapping(value = "/pack/add/auth")
    @ManagerAuth
    @Transactional
    public R add(Pack pack) {
        packService.insert(pack);
        return R.ok();
        String barcode = pack.getBarcode();
        Date now = new Date();
        pack.setStatus(1);
        pack.setUpdateTime(now);
        pack.setUpdateBy(getUserId());
        pack.setCreateBy(getUserId());
        pack.setCreateTime(now);
        if (!packService.insert(pack)) {
            throw new CoolException("response.server_internal_error_contact_admin");
        }
        Mat mat = new Mat();
        mat.setTagId(tagService.getTop().getId());
        mat.setMatnr(barcode);
        mat.setMaktx(barcode);
        mat.setStatus(1);
        mat.setCreateTime(now);
        mat.setUpdateTime(now);
        mat.setMemo("response.pack_online");
        if (!matService.insert(mat)) {
            throw new CoolException("response.server_internal_error_contact_admin");
        }
        return R.ok("response.save_success");
    }

   @RequestMapping(value = "/pack/update/auth")
   @ManagerAuth
    @ManagerAuth
    public R update(Pack pack){
        if (Cools.isEmpty(pack) || null==pack.getId()){
            return R.error();
            return R.error("response.param_error");
        }
        pack.setUpdateBy(getUserId());
        pack.setUpdateTime(new Date());
        packService.updateById(pack);
        return R.ok();
        return R.ok("response.update_success");
    }

    @RequestMapping(value = "/pack/delete/auth")
@@ -83,7 +113,7 @@
         for (Long id : ids){
            packService.deleteById(id);
        }
        return R.ok();
        return R.ok("response.delete_success");
    }

    @RequestMapping(value = "/pack/export/auth")
@@ -118,9 +148,11 @@
    public R query(@RequestBody JSONObject param) {
        Wrapper<Pack> wrapper = new EntityWrapper<Pack>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != packService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(Pack.class, String.valueOf(param.get("key"))));
            R r = R.parse(BaseRes.REPEAT);
            r.put("data",  getComment(Pack.class, String.valueOf(param.get("key"))));
            return r;
        }
        return R.ok();
        return R.ok("response.operation_success");
    }

}