#新增 1. 出库单生成fieldsIndex

skyouc

3 天以前 ac852588e581738264639e832dab13b926d47132

#新增
1. 出库单生成fieldsIndex

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

@@ -117,7 +117,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void reportOrders(List<WkOrder> orders) {
        for (WkOrder order : orders) {
            if (order.getReportOnce() > 4) {
            if (order.getReportOnce() > 4 || order.getNtyStatus() == 1) {
                continue;
            }
            ReportParams params = new ReportParams();
@@ -191,7 +191,7 @@

            R reported = reportMsgService.uploadReportOrders(params);
            if (reported.get("code").equals(200)) {
                order.setNtyStatus(1);
                order.setNtyStatus(1).setReportOnce(order.getReportOnce() + 1) ;
                if (!asnOrderService.updateById(order)) {
                    throw new CoolException("上报状态修改失败！！");
                }

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

@@ -68,6 +68,8 @@

    @Autowired
    private DictDataService dictDataService;
    @Autowired
    private AsnOrderService asnOrderService;

    @Override
    public R generateBarcode(List<Long> orders) {
@@ -248,28 +250,34 @@
        BeanUtils.copyProperties(matnr, wkOrderItem);
        wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());

        //保存扩展字段
        try {
            StringBuffer sb = new StringBuffer();
            if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
                List<Fields> fields = FieldsUtils.getFieldsSta();
                for (Fields field : fields) {
                    if (Objects.isNull(params.get(field.getFields()))) {
                        continue;
        WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
        if (Objects.isNull(wkOrder)) {
            throw new CoolException("数据错误，单据不存在！！");
        }
        if (!wkOrder.getType().equals(OrderType.ORDER_OUT.type)) {
            //保存扩展字段
            try {
                StringBuffer sb = new StringBuffer();
                if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
                    List<Fields> fields = FieldsUtils.getFieldsSta();
                    for (Fields field : fields) {
                        if (Objects.isNull(params.get(field.getFields()))) {
                            continue;
                        }
                        //字段拼接
                        sb.append(params.get(field.getFields()));
                    }
                    //字段拼接
                    sb.append(params.get(field.getFields()));
                    sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
                    //获取16位uuid
                    String uuid16 = Cools.md5Chinese(sb.toString());
                    wkOrderItem.setFieldsIndex(uuid16);
                    params.put("index", uuid16);
                }
                sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
                //获取16位uuid
                String uuid16 = Cools.md5Chinese(sb.toString());
                wkOrderItem.setFieldsIndex(uuid16);
                params.put("index", uuid16);
                //保存或更新动态字段值
                FieldsUtils.updateFieldsValue(params);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            //保存或更新动态字段值
            FieldsUtils.updateFieldsValue(params);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        wkOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
        if (!this.saveOrUpdate(wkOrderItem)) {