#

luxiaotao1123

2022-04-20 c4cd39a3649843b5e6e01810a9c93fa6c60f1f56

#

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

@@ -8,6 +8,7 @@
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +23,7 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
public class OpenController {
public class OpenController extends BaseController {

    private static final boolean auth = true;
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -50,7 +51,7 @@
        return R.ok();
    }

    


    /**
     * 添加入库单

 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
@@ -60,8 +69,28 @@

    @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);
        if (!matService.insert(mat)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }
        return R.ok();
    }


 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -43,6 +43,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private PackService packService;
    @Autowired
    private TagService tagService;

    @Override
    @Transactional
@@ -311,6 +313,7 @@
    }

    @Override
    @Transactional
    public void packageUp(String barcode) {
        Pack pack = packService.selectByBarcode(barcode);
        if (null != pack) {
@@ -333,6 +336,16 @@
        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);
        if (!matService.insert(mat)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }
    }

}