erp物料对接修改

zc

1 天以前 7fde09ac25f86667325e65ddcd0ad9769aa187d1

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

@@ -396,7 +396,7 @@
            syncOrders.forEach(syncOrder -> {
                WkOrder wkOrder = new WkOrder();
                DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
                        .eq(DictData::getLabel, syncOrder.getWkType()), false);
                        .eq(DictData::getValue, syncOrder.getWkType()), false);
                if (Objects.isNull(one)) {
                    throw new CoolException("单据：" + syncOrder.getOrderNo() + ", 业务类型不存在！！");
                }
@@ -424,6 +424,8 @@
                        .setWkType(OrderWorkType.getWorkType(syncOrder.getWkType()))
                        .setAnfme(syncOrder.getAnfme())
                        .setPoCode(syncOrder.getOrderNo())
                        .setWorkQty(0.0)
                        .setQty(0.0)
                        .setPoId(syncOrder.getOrderId())
                        .setCode(ruleCode)
                        .setArrTime(syncOrder.getArrTime())
@@ -436,12 +438,13 @@
                    throw new CoolException("单据保存失败！！");
                }

                syncOrder.getOrdersItems().forEach(orderItem -> {
                syncOrder.getOrderItems().forEach(orderItem -> {
                    Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
                    map.put("orderId", wkOrder.getId());
                    map.put("poId", wkOrder.getPoId());
                    map.put("poCode", wkOrder.getPoCode());
                    map.put("order_code", wkOrder.getCode());
                    map.put("matnrCode", orderItem.getMatnr());

                    if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                        throw new CoolException("明细保存失败！！");
@@ -619,7 +622,7 @@
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("请确认单据：" + order.getOrderNo() + "是否已经执行或是否同步！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
            order.getOrderItems().forEach(orderItem -> {
                WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
@@ -669,7 +672,7 @@
            if (Objects.isNull(wkOrder)) {
                throw new CoolException("订单：" + wkOrder.getCode() + "，当前状态，不可执行删除操作！！");
            }
            order.getOrdersItems().forEach(orderItem -> {
            order.getOrderItems().forEach(orderItem -> {
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
                        .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())