13

zhang

2 天以前 82de5a307466894bbb0258f8a63a26a7bb96d80d

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

@@ -9,22 +9,28 @@
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.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
public class PackController extends BaseController {

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

    @RequestMapping(value = "/pack/{id}/auth")
    @ManagerAuth
@@ -34,24 +40,26 @@

    @RequestMapping(value = "/pack/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<Pack> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -63,25 +71,48 @@

    @RequestMapping(value = "/pack/add/auth")
    @ManagerAuth
    @Transactional
    public R add(Pack pack) {
        packService.insert(pack);
        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("服务器内部错误，请联系管理员");
        }
        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("打包上线");
        if (!matService.insert(mat)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }
        return R.ok();
    }

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

    @RequestMapping(value = "/pack/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            packService.deleteById(id);
        }
        return R.ok();
@@ -89,7 +120,7 @@

    @RequestMapping(value = "/pack/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<Pack> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("pack"));
@@ -105,7 +136,7 @@
        wrapper.like("id", condition);
        Page<Pack> page = packService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Pack pack : page.getRecords()){
        for (Pack pack : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", pack.getId());
            map.put("value", pack.getId());
@@ -118,7 +149,7 @@
    @ManagerAuth
    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)){
        if (null != packService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(Pack.class, String.valueOf(param.get("key"))));
        }
        return R.ok();