转历史单优化

cl

4 天以前 400881f9103218313c552b254c8312b54a24f563

转历史单优化

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -82,8 +82,6 @@
    public void InStockToLog() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                .isNotNull(WkOrder::getPoCode)
                .ne(WkOrder::getPoCode, "")
                .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
        if (wkOrders.isEmpty()) {
            return;
@@ -108,8 +106,6 @@
    public void outStockComplete() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
                .isNotNull(WkOrder::getPoCode)
                .ne(WkOrder::getPoCode, "")
                .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val));
        if (wkOrders.isEmpty()) {
            return;
@@ -142,11 +138,10 @@
        for (WkOrder order : wkOrders) {
            if (order.getType().equals(OrderType.ORDER_OUT.type)) {
                try {
                    //上报次数限定
                    if (order.getReportOnce() < 4) {
                        //上报已完成订单至ERP、MES等三方系统
                    int ro = order.getReportOnce() != null ? order.getReportOnce() : 0;
                    if (ro < 4) {
                        reportMsgService.reportOrders(order);
                        order.setReportOnce(order.getReportOnce() + 1);
                        order.setReportOnce(ro + 1);
                        if (!asnOrderService.updateById(order)) {
                            log.error(order.getCode() + "，单据上传次数修改失败！！");
                        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -1708,10 +1708,16 @@
                if (group == null || group.isEmpty()) continue;
                TaskItem rep = group.get(0);
                TaskItem ti = new TaskItem();
                ti.setTaskId(pickInTask.getId());
                ti.setMatnrId(rep.getMatnrId()).setMaktx(rep.getMaktx()).setMatnrCode(rep.getMatnrCode());
                ti.setBatch(rep.getBatch()).setFieldsIndex(rep.getFieldsIndex()).setUnit(rep.getUnit()).setSpec(rep.getSpec()).setModel(rep.getModel());
                ti.setAnfme(rem).setQty(0.0);
                BeanUtils.copyProperties(rep, ti);
                ti.setId(null)
                        .setTaskId(pickInTask.getId())
                        .setAnfme(rem)
                        .setQty(0.0)
                        .setWorkQty(0.0)
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date());
                taskItemService.save(ti);
                LocItemWorking w = new LocItemWorking();
                w.setTaskId(pickInTask.getId());