#

zyx

2024-05-08 4d99b3dd7a4e3aba703740152bd1c2d72a36874e

#

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

@@ -1,12 +1,17 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +38,10 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -108,6 +117,38 @@
        return R.ok();
    }

    /**
     * 订单删除接口
     */
    @PostMapping("/order/delete/default/v1")
    @AppAuth(memo = "单据删除")
    public synchronized R deleteOrder(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getCCode())) {
            return R.error("单据编号[orderNo]不能为空");
        }

        String orderNo = param.getCCode();

        Order order = orderService.selectByNo(orderNo);
        if(Cools.isEmpty(order)){
            return R.error("单据不存在");
        }
        if (order.getSettle()>1){
            return R.error("单据正在作业，无法删除该单据。");
        }

        orderService.delete(new EntityWrapper<Order>().eq("id", order.getId()));
        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));

        return R.ok("单据删除成功");
    }



    /**

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

@@ -28,6 +28,10 @@
    //主体
    private String cAccount;

    public void setcCusName(String cCusName) {
        this.cCusName = cCusName;
    }

    //公司
    private String cCusName;

@@ -45,7 +49,7 @@
    }

    public void setdDate(String dDate) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD hh:mm:ss");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/DD hh:mm:ss");
        this.dDate =  sdf.parse(dDate);
    }


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

@@ -578,7 +578,7 @@
                String type = Cools.isEmpty(pla.getProOrderNo()) ? "调拨入库单" : "生产入库单";
                param.setcCode(pla.getProOrderNo());
                param.setcAccount(pla.getOwner());
                param.setdDate(Utils.getDateStr(new Date()));
                param.setdDate(Utils.getDateStr1(new Date()));
                param.setType(type);

                List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();

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

@@ -5,6 +5,7 @@
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;
@@ -20,11 +21,12 @@



    //@Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/10 * * * * ? ")
    private void looping(){
        List<Order> orders = orderService.selectList(new EntityWrapper<Order>()
                .eq("settle", "4")
                .eq("item_id",1L));
                .eq("item_id",1L)
                .orderBy("update_time",false));
        for (Order order : orders) {
            orderSendHandler.start(order);
        }

 src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java

@@ -52,7 +52,7 @@

        param.setcCode(order.getOrderNo());
        param.setcMaker(order.getOperMemb());
        param.setCCusName(order.getCstmrName());
        param.setcCusName(order.getCstmrName());
        param.setcAccount(order.getNumber());
        param.setcMemo(order.getMemo());
        param.setType(order.getDocType$());

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -212,6 +212,11 @@
        return simpleDateFormat.format(date);
    }

    public static String getDateStr1(Date date){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
        return simpleDateFormat.format(date);
    }

    public static void main(String[] args) {
        SlaveProperties slaveProperties = new SlaveProperties();
        slaveProperties.setDoubleDeep(true);