*

L

10 小时以前 dfed6fe975deaabb6c7ac424d7c0b7119543abba

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

@@ -12,6 +12,8 @@
import com.zy.asrs.service.impl.OrderDetlServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderToLineHandler;
import com.zy.asrs.utils.GroupedLockerOptimizerUtils;
import com.zy.asrs.utils.ToSortLineUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -35,7 +37,6 @@
    @Autowired
    private BasArmMastSignService basArmMastSignService;


    @Scheduled(cron = "0/3 * * * * ? ")
    private void orderToSortLine() {
        //获取未下发单据
@@ -47,17 +48,9 @@

        //遍历单据
        for (String orderNo : orderNos) {
            try{
            List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(orderNo);
            OrderToLine orderToLine = new OrderToLine();
            orderToLine.setOrderNo(orderNo);  //单据编号
            orderToLine.setCreateTime(System.currentTimeMillis());  //创建时间

            Long bindingTag = System.currentTimeMillis();//混搭标记

            List<OrderToLine.MatList> matLists = new ArrayList<>();
            List<OrderToLine.MatList> matListsRemainder = new ArrayList<>();
            List<OrderDetl> orderDetlsRemainder = new ArrayList<>();

                List<GroupedLockerOptimizerUtils.Item> items = new ArrayList<>();
            for (OrderDetl orderDetl : orderDetls) {
                Integer number =  basArmRulesService.getNumber(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
                if (number == null) {
@@ -71,53 +64,27 @@
                } else if (number == 0){
                    return;
                }
                Double anfme = orderDetl.getAnfme();
                Double remainder = anfme % number;  //取余   余数混搭
//                remainder = 0D;
                if(!remainder.equals(0D)){
                    // 组装物料信息
                    OrderToLine.MatList matMix = new OrderToLine.MatList(
                            orderDetl.getMatnr(),  // matnr -> sku
                            orderDetl.getStandby1(),  //  supp -> po
                            orderDetl.getAnfme(),          //    余料 -> 剩余余料统一时间戳标记
                            orderDetl.getStandby2(),   //barcode -> upc 条码
                            1,
                            null,   //origin -> supplier 货源
                            bindingTag        //余料标记相同
                    );
//                    matListsRemainder.add(matMix);
//                    orderDetlsRemainder.add(orderDetl);
                    matLists.add(matMix);
                } else {
                    Double ctns = anfme - remainder;
                    // 组装物料信息
                    OrderToLine.MatList mat = new OrderToLine.MatList(
                            orderDetl.getMatnr(),  // matnr -> sku
                            orderDetl.getStandby1(),  //  supp -> po
                            orderDetl.getAnfme(),   //整料
                            orderDetl.getStandby2(),   //barcode -> upc
                            1,
                            null,   //origin -> supplier 货源
                            System.currentTimeMillis()
                    );
                    matLists.add(mat);
                    String name = ToSortLineUtils.MergerParameter(orderDetl.getMatnr(),orderDetl.getStandby1(),orderDetl.getStandby2());
                    int maxCapacity = number;
                    int stock = orderDetl.getAnfme().intValue();
                    items.add(new GroupedLockerOptimizerUtils.Item(name, maxCapacity, stock));
                }
            }
//            // 智能分组余料
//            if (matListsRemainder.size() > 0) {
//                groupRemainders(orderDetlsRemainder, orderDetlsRemainder.size(), orderDetls.size(), matLists);
//            }
            orderToLine.setMatList(matLists);

                OrderToLine orderToLine = new OrderToLine();
                orderToLine.setOrderNo(orderNo);  //单据编号
                orderToLine.setCreateTime(System.currentTimeMillis());  //创建时间
                OrderToLine orderToLineR = ToSortLineUtils.GetOrderToLine(items, orderToLine);

            try{
                ReturnT<String> returnT = orderToLineHandler.start(orderToLine);
                    ReturnT<String> returnT = orderToLineHandler.start(orderToLineR);
                if (!returnT.isSuccess()) {
                    log.error("下发单据失败===>"+ JSON.toJSON(orderToLine));
                }
                        log.error("下发单据失败===>"+ JSON.toJSON(orderToLineR));
                    } else {
                try{
                    for (OrderToLine.MatList matList:orderToLine.getMatList()){
                            for (OrderToLine.MatList matList:orderToLineR.getMatList()){
                        BasArmMastSign basArmMastSign = new BasArmMastSign();
                        basArmMastSign.setMatnr(matList.getSku());
                        basArmMastSign.setOrderNo(orderToLine.getOrderNo());
                                basArmMastSign.setOrderNo(orderToLineR.getOrderNo());
                        basArmMastSign.setSku(matList.getSku());
                        basArmMastSign.setPo(matList.getPo());
                        basArmMastSign.setUpc(matList.getUpc());
@@ -126,15 +93,15 @@
                        basArmMastSign.setCreateTime(matList.getBindingTags());
                        basArmMastSignService.insert(basArmMastSign);
                    }
                }catch (Exception e){

                        }catch (Exception e){}
                }
            } catch (Exception e){
                log.error("下发单据异常===>"+e.getMessage());
            }

            } catch (Exception e){
                log.error("下发单据异常,跳转下一个订单===>"+e.getMessage());
        }

        }
    }