#

Junjie

2024-09-09 9060dd329b8500f58709b31aade3c2f48e19c233

#

 zy-asrs-admin/src/components/order/index.vue

@@ -66,6 +66,13 @@
    ...getColumnSearchProps('orderSettle$'),
  },
  {
    title: formatMessage('db.man_order.ioPri', '优先级'),
    dataIndex: 'ioPri',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('ioPri'),
  },
  {
    title: formatMessage('db.man_order.status', '状态'),
    dataIndex: 'status$',
    width: 140,
@@ -250,10 +257,10 @@
  }
  if (info.file.status === 'done') {
    let result = info.file.response;
    if(result.code == 200) {
    if (result.code == 200) {
      message.success(`${info.file.name} ${formatMessage('page.upload.success', '上传成功')}`);
      getPage()
    }else {
    } else {
      message.error(result.msg);
    }
  } else if (info.file.status === 'error') {

 zy-asrs-admin/src/views/order/orderLog/index.vue

@@ -26,76 +26,83 @@
} = useTableSearch();

const columns = [
        {
            title: formatMessage('db.man_order_log.order_no', '订单编号'),
            dataIndex: 'orderNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderNo'),
        },
        {
            title: formatMessage('db.man_order_log.order_time', '单据日期'),
            dataIndex: 'orderTime',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderTime'),
        },
        {
            title: formatMessage('db.man_order_log.order_type', '单据类型'),
            dataIndex: 'orderType$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderType$'),
        },
        {
            title: formatMessage('db.man_order_log.order_settle', '单据状态'),
            dataIndex: 'orderSettle$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderSettle$'),
        },
        {
            title: formatMessage('db.man_order_log.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('status$'),
        },
        {
            title: formatMessage('db.man_order_log.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createTime$'),
        },
        {
            title: formatMessage('db.man_order_log.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createBy$'),
        },
        {
            title: formatMessage('db.man_order_log.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateTime$'),
        },
        {
            title: formatMessage('db.man_order_log.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateBy$'),
        },
        {
            title: formatMessage('db.man_order_log.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('memo'),
        },
  {
    title: formatMessage('db.man_order_log.order_no', '订单编号'),
    dataIndex: 'orderNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
  },
  {
    title: formatMessage('db.man_order_log.order_time', '单据日期'),
    dataIndex: 'orderTime',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderTime'),
  },
  {
    title: formatMessage('db.man_order_log.order_type', '单据类型'),
    dataIndex: 'orderType$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderType$'),
  },
  {
    title: formatMessage('db.man_order_log.order_settle', '单据状态'),
    dataIndex: 'orderSettle$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderSettle$'),
  },
  {
    title: formatMessage('db.man_order_log.ioPri', '优先级'),
    dataIndex: 'ioPri',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('ioPri'),
  },
  {
    title: formatMessage('db.man_order_log.status', '状态'),
    dataIndex: 'status$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('status$'),
  },
  {
    title: formatMessage('db.man_order_log.create_time', '添加时间'),
    dataIndex: 'createTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('createTime$'),
  },
  {
    title: formatMessage('db.man_order_log.create_by', '添加人员'),
    dataIndex: 'createBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('createBy$'),
  },
  {
    title: formatMessage('db.man_order_log.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_order_log.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_order_log.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('memo'),
  },

  {
    title: formatMessage('common.operation', '操作'),

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java

@@ -114,6 +114,12 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 优先级
     */
    @ApiModelProperty(value= "优先级")
    private Integer ioPri;

    public Order() {}

    public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java

@@ -116,6 +116,12 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 优先级
     */
    @ApiModelProperty(value= "优先级")
    private Integer ioPri;

    public OrderLog() {}

    public OrderLog(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java

@@ -9,6 +9,7 @@
import com.zy.asrs.wms.asrs.mapper.OrderMapper;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wms.utils.OrderUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +32,8 @@
    private OrderDetlFieldService orderDetlFieldService;
    @Autowired
    private OrderNoRuleService orderNoRuleService;
    @Autowired
    private OrderUtils orderUtils;

    @Override
    @Transactional
@@ -60,6 +63,7 @@
        order.setOrderNo(orderNo);
        order.setOrderType(param.getOrderType());
        order.setOrderSettle(param.getOrderSettle());
        order.setIoPri(orderUtils.getIoPri());
        order.setOrderTime(format.format(new Date()));
        order.setCreateTime(new Date());
        order.setCreateBy(9527L);

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java

@@ -54,4 +54,8 @@
        }
    }

    public Integer getIoPri() {
        return 11;
    }

}