#

zjj

2024-08-31 c31bf5a8902485b750b5814a0d1c54ecc65d2c96

#

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

@@ -16,6 +16,8 @@
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -48,6 +50,28 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private LocOwnerService locOwnerService;
    @Autowired
    private UserService userService;


    @PostMapping("/order/getInformation/notFinished")
    @AppAuth(memo = "订单信息查询")
    public synchronized R orderInformationSelect(@RequestHeader(required = false) String appkey,
                                                @RequestBody(required = false) Map<String,String> param,
                                                HttpServletRequest request)
    {
        auth(appkey, param, request);
        String name = param.get("name");
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
        if (Cools.isEmpty(user)){
            return R.error("未找到用户");
        }
        List<String> stringList = openService.selectOrderInformation(param);
        return R.ok(stringList);
    }

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")

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

@@ -7,6 +7,7 @@

import java.text.ParseException;
import java.util.List;
import java.util.Map;

public interface OpenService {

@@ -50,4 +51,6 @@
    DigitalTwin inventoryQuantity();

    int pakinReportErp(JSONObject jsonObject) throws ParseException;

    List<String> selectOrderInformation(Map<String, String> param);
}

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

@@ -9,6 +9,7 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.InOutCountDto;
@@ -30,9 +31,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * Created by vincent on 2022/4/9
@@ -630,6 +629,27 @@

    }

    @Override
    public List<String> selectOrderInformation(Map<String, String> param) {
        ArrayList<String> list = new ArrayList<>();
        String name = param.get("name");
        User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
        if (Cools.isEmpty(user)){
            return list;
        }
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("create_by", user.getId()));
        if (Cools.isEmpty(orderList)){
            return list;
        }
        for (Order order : orderList){
            if (order.getSettle() ==1 || order.getSettle() ==2){
                list.add(order.getOrderNo());
            }
        }

        return list;
    }

    private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo){

        for (OpenOrderPakoutParam param : list){