#

luxiaotao1123

2022-04-09 fb4e25eb597358276470daeb9df7a40e0d622616

#

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

@@ -1,23 +1,18 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.common.*;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.asrs.service.OpenService;
import lombok.extern.slf4j.Slf4j;
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.Date;
import java.util.List;

/**
 * Created by vincent on 2022/4/8
@@ -27,40 +22,20 @@
@RequestMapping("open/asrs")
public class OpenController {

    private static final boolean auth = false;
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};

    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;

    private void auth(String appkey, Object obj) {
        log.info("{}接口被访问！appkey:{},请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
    }
    private OpenService openService;

    /**
     * æ·»åŠ å…¥åº“单
     */
    @PostMapping("/order/pakin/new/default/v1")
    @Transactional
    public synchronized R orderCreate(@RequestHeader(required = false) String appkey,
                                      @RequestBody OpenOrderPakinParam param) {
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param) {
        auth(appkey, param);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -74,84 +49,7 @@
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order)) {
            return R.error(param.getOrderNo() + "单据已存在，请勿重复提交");
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType());
        Date now = new Date();
        // å•æ®ä¸»æ¡£
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // ç¼–号[非空]
                param.getOrderNo(),    // è®¢å•ç¼–号
                DateUtils.convert(now),    // å•æ®æ—¥æœŸ
                docType.getDocId(),    // å•æ®ç±»åž‹
                null,    // é¡¹ç›®ç¼–号
                null,    //
                null,    // è°ƒæ‹¨é¡¹ç›®ç¼–号
                null,    // åˆå§‹ç¥¨æ®å·
                null,    // ç¥¨æ®å·
                null,    // å®¢æˆ·ç¼–号
                null,    // å®¢æˆ·
                null,    // è”系方式
                null,    // æ“ä½œäººå‘˜
                null,    // åˆè®¡é‡‘额
                null,    // ä¼˜æƒ çŽ‡
                null,    // ä¼˜æƒ é‡‘额
                null,    // é”€å”®æˆ–采购费用合计
                null,    // å®žä»˜é‡‘额
                null,    // ä»˜æ¬¾ç±»åž‹
                null,    // ä¸šåŠ¡å‘˜
                null,    // ç»“算天数
                null,    // é‚®è´¹æ”¯ä»˜ç±»åž‹
                null,    // é‚®è´¹
                null,    // ä»˜æ¬¾æ—¶é—´
                null,    // å‘货时间
                null,    // ç‰©æµåç§°
                null,    // ç‰©æµå•å·
                1L,    // è®¢å•çŠ¶æ€
                1,    // çŠ¶æ€
                9527L,    // æ·»åŠ äººå‘˜
                now,    // æ·»åŠ æ—¶é—´
                9527L,    // ä¿®æ”¹äººå‘˜
                now,    // ä¿®æ”¹æ—¶é—´
                null    // å¤‡æ³¨
        );
        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }
        // å•æ®æ˜Žç»†æ¡£
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getOrderDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
            } else {
                list.add(dto);
            }
        }
        for (DetlDto detlDto : list) {
            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }
        openService.pakinOrderCreate(param);
        return R.ok();
    }

@@ -159,10 +57,10 @@
     * å…¥åº“单回写
     */
    @PostMapping("/order/pakin/complete/default/v1")
    @Transactional
    public synchronized R orderComplete(@RequestHeader(required = false) String appkey) {
        auth(appkey, null);
        return R.ok();
    public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
                                        @RequestBody OpenOrderCompleteParam param) {
        auth(appkey, param);
        return R.ok().add(openService.pakinOrderComplete(param));
    }

    /**
@@ -171,7 +69,21 @@
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey) {
        auth(appkey, null);
        return R.ok(locDetlService.queryStockTotal());
        return R.ok().add(openService.queryStock());
    }


    private void auth(String appkey, Object obj) {
        log.info("{}接口被访问！appkey:{},请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        if (!auth) {
            return;
        }
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
    }

}

 src/main/java/com/zy/asrs/entity/param/OpenOrderCompleteParam.java

New file
@@ -0,0 +1,13 @@
package com.zy.asrs.entity.param;

import lombok.Data;

/**
 * Created by vincent on 2022/4/9
 */
@Data
public class OpenOrderCompleteParam {

    private String orderNo;

}

 src/main/java/com/zy/asrs/service/OpenService.java

New file
@@ -0,0 +1,27 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.result.StockVo;

import java.util.List;

public interface OpenService {

    /**
     * æ·»åŠ å…¥åº“单
     */
    void pakinOrderCreate(OpenOrderPakinParam param);

    /**
     * å…¥åº“单回写
     */
    Object pakinOrderComplete(OpenOrderCompleteParam param);

    /**
     * åº“存统计
     */
    List<StockVo> queryStock();


}

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

New file
@@ -0,0 +1,137 @@
package com.zy.asrs.service.impl;

import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * Created by vincent on 2022/4/9
 */
@Service
public class OpenServiceImpl implements OpenService {

    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;

    @Override
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {
        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order)) {
            throw new CoolException(param.getOrderNo() + "单据已存在，请勿重复提交");
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType());
        Date now = new Date();
        // å•æ®ä¸»æ¡£
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // ç¼–号[非空]
                param.getOrderNo(),    // è®¢å•ç¼–号
                DateUtils.convert(now),    // å•æ®æ—¥æœŸ
                docType.getDocId(),    // å•æ®ç±»åž‹
                null,    // é¡¹ç›®ç¼–号
                null,    //
                null,    // è°ƒæ‹¨é¡¹ç›®ç¼–号
                null,    // åˆå§‹ç¥¨æ®å·
                null,    // ç¥¨æ®å·
                null,    // å®¢æˆ·ç¼–号
                null,    // å®¢æˆ·
                null,    // è”系方式
                null,    // æ“ä½œäººå‘˜
                null,    // åˆè®¡é‡‘额
                null,    // ä¼˜æƒ çŽ‡
                null,    // ä¼˜æƒ é‡‘额
                null,    // é”€å”®æˆ–采购费用合计
                null,    // å®žä»˜é‡‘额
                null,    // ä»˜æ¬¾ç±»åž‹
                null,    // ä¸šåŠ¡å‘˜
                null,    // ç»“算天数
                null,    // é‚®è´¹æ”¯ä»˜ç±»åž‹
                null,    // é‚®è´¹
                null,    // ä»˜æ¬¾æ—¶é—´
                null,    // å‘货时间
                null,    // ç‰©æµåç§°
                null,    // ç‰©æµå•å·
                1L,    // è®¢å•çŠ¶æ€
                1,    // çŠ¶æ€
                9527L,    // æ·»åŠ äººå‘˜
                now,    // æ·»åŠ æ—¶é—´
                9527L,    // ä¿®æ”¹äººå‘˜
                now,    // ä¿®æ”¹æ—¶é—´
                null    // å¤‡æ³¨
        );
        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }
        // å•æ®æ˜Žç»†æ¡£
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getOrderDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
            } else {
                list.add(dto);
            }
        }
        for (DetlDto detlDto : list) {
            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }
    }

    @Override
    public Object pakinOrderComplete(OpenOrderCompleteParam param) {
        return null;
    }

    @Override
    @Transactional
    public List<StockVo> queryStock() {
        return locDetlService.queryStockTotal();
    }

}

 version/×Ô¶¯»¯Á¢¿âƽ̨¶Ô½ÓЭÒé.docx

Binary files differ