lsh#

1

2 天以前 e07b5ecacc2476cf551d665af92d3bb902aa0e90

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -44,6 +44,8 @@
import java.util.*;
import java.util.stream.Collectors;

import static com.vincent.rsf.server.system.utils.SerialRuleUtils.objectToMap;

/**
 * @author Ryan
 * @version 1.0
@@ -67,6 +69,8 @@
    private MatnrServiceImpl matnrService;
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderLogService asnOrderLogService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
@@ -227,8 +231,18 @@
        WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getPoCode, queryParams.getOrderNo()));
        if (Objects.isNull(wkOrders)) {
            throw new CoolException("单据不存在！！");
            Map<String, Object> map = new HashMap<>();
            map.put("exceStatus", "-1");
            return R.ok("单据不存在 ！！").add(map);
        }

        AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
        if (!Objects.isNull(orderLog)) {
            Map<String, Object> map = new HashMap<>();
            map.put("exceStatus", "4");
            return R.ok("单据已完成 ！！").add(map);
        }

        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId()));

        WkOrderDto wkorderDto = new WkOrderDto();
@@ -393,13 +407,13 @@
    public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
        if (!syncOrders.isEmpty()) {
            syncOrders.forEach(syncOrder -> {
                WkOrder wkOrder = new WkOrder();
                WkOrder wkOrder = new WkOrder(syncOrder);
                DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
                        .eq(DictData::getValue, syncOrder.getWkType()), false);
                if (Objects.isNull(one)) {
                    throw new CoolException("单据：" + syncOrder.getOrderNo() + ", 业务类型不存在！！");
                }
                WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                 WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
                        .eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
                if (!Objects.isNull(order)) {
@@ -418,14 +432,21 @@
                    rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
                }

                String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
                //银座特供
                String orderNs = null;
                if (rule.equals(SerialRuleCode.SYS_ASN_ORDER) || rule.equals(SerialRuleCode.SYS_OUT_STOCK_CODE) ){
                    StringBuffer buffer = new StringBuffer();
                    Object poCode = syncOrder.getOrderNo();
                    orderNs = poCode == null ? "" : buffer.append(poCode).toString();
                }
                String ruleCode = orderNs;
                wkOrder.setType(syncOrder.getType())
                        .setWkType(one.getValue())
                        .setAnfme(syncOrder.getAnfme())
                        .setPoCode(syncOrder.getOrderNo())
                        .setWorkQty(0.0)
                        .setQty(0.0)
                        .setPoId(syncOrder.getOrderId())
                        .setPoId(syncOrder.getOrderInternalCode())
                        .setCode(ruleCode)
                        .setArrTime(syncOrder.getArrTime())
                        .setId(null)
@@ -449,6 +470,14 @@
                    map.put("poCode", wkOrder.getPoCode());
                    map.put("order_code", wkOrder.getCode());
                    map.put("matnrCode", orderItem.getMatnr());
                    map.put("platWorkCode", orderItem.getPlanNo());
                    map.put("platItemId", orderItem.getLineId());
                    map.put("splrBatch", orderItem.getBatch());
                    map.put("batch", orderItem.getBatch());
                    map.put("spec", orderItem.getSpecs());
                    map.put("model", orderItem.getModel());
                    map.put("stockUnit", orderItem.getUnit());
                    map.put("purUnit", orderItem.getUnit());

                    if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                        throw new CoolException("明细保存失败！！");