#

lsh

2024-06-19 ef80b79803b06f60d9282f23afa559ce83e7ff69

 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
@@ -43,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));
    }
@@ -63,8 +69,29 @@

    @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();
    }

@@ -74,6 +101,8 @@
        if (Cools.isEmpty(pack) || null==pack.getId()){
            return R.error();
        }
        pack.setUpdateBy(getUserId());
        pack.setUpdateTime(new Date());
        packService.updateById(pack);
        return R.ok();
    }