zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue

@@ -29,7 +29,7 @@
                    <td class="barcode" colspan="9" align="center" scope="col">
                        <img :src="globalState.url + '/api/code/auth?type=1&param=' + item.locNo" width="90%;" height="180px"/>
                        <div style="letter-spacing: 2px;margin-top: 10px; text-align: center;">
                            <span>{{ item.locNo }} </span>
                            <span style="font-size: 55px;">{{ item.locNo }} </span>
                        </div>
                    </td>
                </tr>

 zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue

@@ -17,13 +17,13 @@
</script>



<template>

    <div id="printMe">

    <div id="printMe" style="width: 700px;">

        <div v-for="(item, index) in list" :key="index">

            <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 20px;">

                <div style="text-align: center;">

                    <img :src="globalState.url + '/api/code/auth?type=1&param=' + item.barcode" />

            <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 40px;height: 300px;">

                <div style="text-align: center; ">

                    <img :src="globalState.url + '/api/code/auth?type=1&param=' + item.barcode" style="width: 600px; height: 180px;" />

                </div>

                <div style="text-align: center;">

                <div style="text-align: center; font-size: 55px; font-weight: 600;">

                    {{ item.barcode }}

                </div>

            </div>

@@ -32,6 +32,11 @@
</template>



<style>



.ant-modal-content {

    width: 700px;

}



@media print {

    body {

        margin: 0;


 zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template2.vue

@@ -21,9 +21,9 @@
        <div v-for="(item, index) in list" :key="index">

            <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 20px;">

                <div style="text-align: center;">

                    <img :src="globalState.url + '/api/code/auth?type=2&param=' + item.barcode" />

                    <img :src="globalState.url + '/api/code/auth?type=2&param=' + item.barcode" style="width: 200px;height: 200px;;"/>

                </div>

                <div style="text-align: center;">

                <div style="text-align: center; font-size: 55px; font-weight: 600;" >

                    {{ item.barcode }}

                </div>

            </div>


 zy-asrs-admin/src/views/base/container/edit.vue

File was deleted

 zy-asrs-admin/src/views/base/container/index.vue

File was deleted

 zy-asrs-admin/src/views/base/zpalletBarcode/index.vue

@@ -21,6 +21,7 @@


let openGenerate = ref(false);

let generateBarcodeValue = ref("80000001");

let pakinType = ref(1);

let generateNum = ref(100);



const state = reactive({

@@ -211,6 +212,7 @@
  post('/api/zpalletBarcode/generate', {

    barcode: generateBarcodeValue.value,

    num: generateNum.value,

    type: pakinType.value

  }).then((resp) => {

    let result = resp.data;

    if (result.code == 200) {

@@ -227,20 +229,20 @@
}



const handlePrint = () => {

    if (state.selectedRowKeys.length == 0) {

        message.warning(formatMessage('common.select', '请选择'));

        return;

  if (state.selectedRowKeys.length == 0) {

    message.warning(formatMessage('common.select', '请选择'));

    return;

  }

  let data = tableData.value.records;

  let tmp = [];

  data.forEach((item) => {

    if (state.selectedRowKeys.indexOf(item.id) != -1) {

      tmp.push(item);

    }

    let data = tableData.value.records;

    let tmp = [];

    data.forEach((item) => {

        if (state.selectedRowKeys.indexOf(item.id) != -1) {

            tmp.push(item);

        }

    })

  })



    printChild.value.printData = tmp;

    printChild.value.open = true;

  printChild.value.printData = tmp;

  printChild.value.open = true;

}



</script>

@@ -272,13 +274,14 @@
    <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"

      :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"

      :pagination="{ total: tableData.total, onChange: onPageChange }"

      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">

      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"

      :loading="state.loading">

      <template #bodyCell="{ column, text, record }">

        <template v-if="column.dataIndex === 'oper'">

          <div style="display: flex;justify-content: space-evenly;">

            <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '编辑') }}</a-button>

            <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '删除')

              }}</a-button>

            }}</a-button>

          </div>

        </template>

      </template>

@@ -293,6 +296,13 @@
        <a-form-item :label="formatMessage('db.man_zpallet_barcode.generateNum', '生成数量')">

          <a-input v-model:value="generateNum" />

        </a-form-item>

        <a-form-item :label="formatMessage('db.man_container.type', '托盘类型')" name="type" >

          <a-select v-model:value="pakinType" :options="[

            { label: '平库托盘', value: 1 },

            { label: '立库托盘', value: 2 },

          ]">

          </a-select>

        </a-form-item>

      </a-form>

    </a-modal>




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

@@ -338,7 +338,7 @@
            <DownOutlined />

          </a-button>

        </a-dropdown>

        <a-button @click="generateTask()" type="primary">{{ formatMessage('page.generateTask', '生成任务') }}</a-button>

        <!-- <a-button @click="generateTask()" type="primary">{{ formatMessage('page.generateTask', '生成任务') }}</a-button> -->

        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '添加') }}</a-button>

        <a-button @click="handleExport">{{ formatMessage('page.export', '导出') }}</a-button>

      </div>


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java

File was deleted

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ZpalletBarcodeController.java

@@ -1,5 +1,6 @@
package com.zy.asrs.wms.asrs.controller;



import com.alibaba.excel.util.StringUtils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import com.zy.asrs.framework.common.Cools;

@@ -18,10 +19,7 @@
import org.springframework.web.bind.annotation.*;



import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;

import java.util.*;



@RestController

@RequestMapping("/api")

@@ -108,20 +106,42 @@
    public R generate(@RequestBody Map<String, Object> map) {

        Object barcode = map.get("barcode");

        Object num = map.get("num");

        Object type = map.get("type");

        if (barcode == null || num == null) {

            return R.error("缺少参数");

        }



        String pakinType = "flat";

        if (!Objects.isNull(type)) {

            type = type.toString();

            if (type.toString().equals("1")) {

                pakinType =  "flat";

            } else {

                pakinType = "ctu";

            }

        }

        ZpalletBarcode one = zpalletBarcodeService.getOne(new LambdaQueryWrapper<ZpalletBarcode>().eq(ZpalletBarcode::getBarcode, barcode));

        if (one != null) {

            return R.error("条码起始值已存在");

        }

        int barcodeInt = Integer.parseInt(String.valueOf(barcode));

        for (int i = 0; i < Integer.parseInt(String.valueOf(num)); i++) {

            ZpalletBarcode zpalletBarcode = new ZpalletBarcode();

            zpalletBarcode.setBarcode(String.valueOf(barcodeInt));

            zpalletBarcodeService.save(zpalletBarcode);

            barcodeInt += 1;

        if (pakinType.equals("flat")) {

            int barcodeInt = Integer.parseInt(String.valueOf(barcode));

            for (int i = 0; i < Integer.parseInt(String.valueOf(num)); i++) {

                ZpalletBarcode zpalletBarcode = new ZpalletBarcode();

                String strBarcode = String.format("%08d", barcodeInt);

                zpalletBarcode.setBarcode("PK" + strBarcode);

                zpalletBarcodeService.save(zpalletBarcode);

                barcodeInt += 1;

            }

        } else {

            int barcodeInt = Integer.parseInt(String.valueOf(barcode));

            for (int i = 0; i < Integer.parseInt(String.valueOf(num)); i++) {

                ZpalletBarcode zpalletBarcode = new ZpalletBarcode();

                String strBarcode = String.format("%08d", barcodeInt);

                zpalletBarcode.setBarcode(strBarcode);

                zpalletBarcodeService.save(zpalletBarcode);

                barcodeInt += 1;

            }

        }

        return R.ok();

    }


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

@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -118,7 +119,7 @@
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Integer tenantId;
    private Integer hostId;

    /**
     * 添加人员
@@ -131,6 +132,7 @@
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
@@ -144,6 +146,7 @@
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
@@ -167,7 +170,7 @@
        this.flagLogic = flagLogic;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.hostId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
@@ -175,27 +178,23 @@
        this.memo = memo;
    }

//    Container container = new Container(
//            null,    // 名称
//            null,    // 容器编码[非空]
//            null,    // 容器类型[非空]
//            null,    // 使用次数[非空]
//            null,    // 长度
//            null,    // 宽度
//            null,    // 高度
//            null,    // 有效期
//            null,    // 是否回收[非空]
//            null,    // 是否虚拟[非空]
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间[非空]
//            null    // 备注
//    );

    public String getType$(){
        if (null == this.type){ return null; }
        switch (this.type){
            case "1":
                return " 钢托盘";
            case  "2":
                return " 木托盘";
            case  "3":
                return " 塑料料框";
            case  "4":
                return "托盘笼箱";
            case  "5":
                return "钢料架";
            default:
                return String.valueOf(this.type);
        }
    }

    public String getVaildTime$(){
        if (Cools.isEmpty(this.vaildTime)){

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java

New file
@@ -0,0 +1,23 @@
package com.zy.asrs.wms.asrs.entity.param;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

import java.io.Serializable;

@Data
@Accessors(chain = true)
@ApiModel(value = "ContainerParams", description = "容器初始化参数")
public class ContainerParams implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("起始数值")
    private Integer startNum;

    @ApiModelProperty("终止数值")
    private Integer endNum;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java

File was deleted

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java

File was deleted

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

File was deleted

 zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml

File was deleted