#

zjj

2024-09-11 4c51dcc99e41edfb4fdc198aa740fa52d29bf641

#

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

@@ -33,6 +33,21 @@
    @Autowired
    private OpenService openService;



    @PostMapping("/locDetl/select/time/v1")
    @AppAuth(memo = "时间获取库存信息")
    public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) TimeSelectParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        List<LocDetlByTimeDTO> locDetlByTimeDTOS = openService.selectTimeLocDetl(param);
        return R.ok(locDetlByTimeDTOS);
    }

    @PostMapping("/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,

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

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

import lombok.Data;

@Data
public class LocDetlByTimeDTO {
    private String locNo;
    private String matnr;
    private String batch;
    private Double anfme;
    private String orderNo;
    private String orderType;
    private String date;
    private String warehouse;

}

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

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

import lombok.Data;

@Data
public class TimeSelectParam {
    private String startTime;
    private String endTime;
}

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

@@ -46,4 +46,5 @@

    boolean agvHaiKang(String wrkNo);

    List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param);
}

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

@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;

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

@@ -554,6 +555,36 @@


    @Override
    public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
        ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
        EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
        locDetlEntityWrapper.ge("create_time",param.getStartTime());
        locDetlEntityWrapper.le("create_time",param.getEndTime());
        List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper);
        if (!Cools.isEmpty(locDetls)) {
            for (LocDetl locDetl : locDetls) {
                LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
                if (!Cools.isEmpty(locDetl.getOrderNo())){
                    Order order = orderService.selectByNo(locDetl.getOrderNo());
                    if (!Cools.isEmpty(order)) {
                        locDetlByTimeDTO.setDate(order.getOrderTime());
                        locDetlByTimeDTO.setWarehouse(order.getItemName());
                        locDetlByTimeDTO.setOrderType(order.getDocType().toString());
                    }
                }

                locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
                locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
                locDetlByTimeDTO.setBatch(locDetl.getBatch());
                locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
                locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
                locDetlByTimeDTOS.add(locDetlByTimeDTO);
            }
        }
        return locDetlByTimeDTOS;
    }

    @Override
    @Transactional
    public boolean agvHaiKang(String wrkNo) {
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Long.parseLong(wrkNo)));