#

zyx

2024-05-13 43800e0eac7ba25e58d251922d95577cca4bef25

#

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

@@ -77,11 +77,12 @@
    @RequestMapping(value = "/orderNoQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<PlaQty> wrapper = new EntityWrapper<>();
        wrapper.setSqlSelect("order_no");
        wrapper.like("id", condition);
        wrapper.groupBy("order_no");
        List<String> list = plaQtyService.selectOrderNo();
//        EntityWrapper<PlaQty> wrapper = new EntityWrapper<>();
//        wrapper.setSqlSelect("order_no");
//        wrapper.like("order_no", Cools.isEmpty(condition) ? "0" : condition);
//        wrapper.groupBy("order_no");
//        Page<PlaQty> plaQtyPage = plaQtyService.selectPage(new Page<>(1, 20), wrapper);
        List<String> list = plaQtyService.selectOrderNo(Cools.isEmpty(condition) ? "0" : condition);
        List<Map<String, Object>> result = new ArrayList<>();
        for (String orderNo : list){
            Map<String, Object> map = new HashMap<>();

 src/main/java/com/zy/asrs/mapper/PlaQtyMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.PlaQty;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;

@@ -12,7 +13,7 @@
@Repository
public interface PlaQtyMapper extends BaseMapper<PlaQty> {

    @Select("select top(10) order_no from asr_pla_qty group by order_no")
    List<String> selectOrderNo();
    @Select("select top(10) order_no from asr_pla_qty where order_no like '%' + #{orderNo} + '%'  group by order_no")
    List<String> selectOrderNo(@Param("orderNo") String orderNo);

}

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

@@ -10,7 +10,7 @@

    JSONArray getDeliveryDate();

    List<String> selectOrderNo();
    List<String> selectOrderNo(String orderNo);


}

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

@@ -53,8 +53,8 @@
    }

    @Override
    public List<String> selectOrderNo() {
        return this.baseMapper.selectOrderNo();
    public List<String> selectOrderNo(String orderNo) {
        return this.baseMapper.selectOrderNo(orderNo);
    }

    public static void main(String[] args) {

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

@@ -93,13 +93,15 @@
    }

    //退回
    @Transactional
    public void returned(List<PlaQty> plaQties, User user) {
        plaQties.forEach(plaQty -> {
            PlaQty plaQtyOut = plaQtyService.selectById(plaQty.getId());
            if(Cools.isEmpty(plaQtyOut.getReturned())){
            if(Cools.isEmpty(plaQtyOut.getReturned()) || plaQtyOut.getReturned() == 0){
                plaQtyOut.setReturned(plaQty.getOrderWeight());
            }else {
                plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
                throw new CoolException("该包物料已退回");
                //plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
            }
            plaQtyService.updateById(plaQtyOut);

@@ -110,6 +112,7 @@
            plaQtyReturned.setLocNo(plaQtyOut.getLocNo());
            plaQtyReturned.setOrderNo(plaQtyOut.getOrderNo());
            plaQtyReturned.setPakoutTime(Utils.getDateStr(new Date()));
            plaQtyReturned.setBrand(plaQty.getBrand());
            plaQtyReturned.setOrderWeight(plaQty.getOrderWeight());
            plaQtyReturned.setTransfer("退回入库");
            plaQtyReturned.setHandlerBy(user.getUsername());

 src/main/java/com/zy/asrs/task/OrderSendScheduler.java

@@ -5,7 +5,6 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.handler.OrderSendHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;
@@ -21,7 +20,7 @@



    @Scheduled(cron = "0/10 * * * * ? ")
    //@Scheduled(cron = "0/10 * * * * ? ")
    private void looping(){
        List<Order> orders = orderService.selectList(new EntityWrapper<Order>()
                .eq("settle", "4")