#

Junjie

2024-08-03 5b9fd4d0464c1d4673bfebef582badc7a15354e2

#

 zy-asrs-admin/src/views/in/waitPakinLog/index.vue

@@ -55,11 +55,18 @@
    ...getColumnSearchProps('barcode'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.detl_id', '明细ID'),
    dataIndex: 'detlId$',
    title: formatMessage('db.man_wait_pakin_log.matnr', '物料号'),
    dataIndex: ['detl$', 'mat$', 'matnr'],
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('detlId$'),
    ...getColumnSearchProps('detl$.matnr'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.batch', '批号'),
    dataIndex: ['detl$', 'batch'],
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('detl$.matnr'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.io_status', '组托状态'),
@@ -242,6 +249,11 @@
              }}</a-button>
          </div>
        </template>

        <template v-if="column.dataIndex === 'ioStatus$'">
          <a-switch :checked="record.ioStatus == 1" :checked-children="formatMessage('waitPakin.switch.open', '入库中')"
            :un-checked-children="formatMessage('waitPakin.switch.close', '待入库')" :disabled="true" />
        </template>
      </template>
    </a-table>
  </div>

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

@@ -5,6 +5,7 @@
import java.util.Date;

import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.OrderLogService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -173,6 +174,15 @@
        return null;
    }

    public OrderDetlLog getDetl$(){
        OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
        OrderDetlLog orderDetlLog = service.getById(this.detlId);
        if (!Cools.isEmpty(orderDetlLog)){
            return orderDetlLog;
        }
        return null;
    }

    public String getDetlId$(){
        OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
        OrderDetlLog orderDetlLog = service.getById(this.detlId);