#

wang..123

2022-02-14 a869e7291b6016b297bc00b30a2e83f8ed3983ea

#

 src/main/java/com/zy/asrs/entity/PltBarcode.java

@@ -9,6 +9,7 @@
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
@@ -16,6 +17,7 @@
import java.util.Date;

@TableName("asr_plt_barcode")
@Data
public class PltBarcode implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -71,6 +73,13 @@
    private Double qty;

    /**
     * 总数量
     */
    @ApiModelProperty(value= "总数量")
    @TableField("all_qty")
    private Double allQty;

    /**
     * 库位号
     */
    @ApiModelProperty(value= "库位号")
@@ -106,15 +115,36 @@
     */
    @ApiModelProperty(value= "单重")
    private Double weight;

    /**
     * 总重
     */
    @ApiModelProperty(value= "总重量")
    @TableField("all_weight")
    private double allWeight;
    /**
     * 来源：1、外协 2、自制 3、客供
     */
    @ApiModelProperty(value="来源：1、外协 2、自制 3、客供")
    private Integer source;
    /**
     * 供应商
     */
    @ApiModelProperty(value = "批号")
    private String supplier;
    /**
     * 供应商
     */
    @ApiModelProperty(value = "供应商")
    @TableField("batch_number")
    private String batchNumber;
    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "批号")
    private String supplier;
//    @ApiModelProperty(value= "批号")
//    private String supplier;

    /**
     * ERP连线 0: 非连线  1: ERP连线  
@@ -170,7 +200,7 @@

    public PltBarcode() {}

    public PltBarcode(String barcode,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
    public PltBarcode(String barcode,double allQty,Integer source,String supplier,String batchNumber,double allWeight,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
        this.barcode = barcode;
        this.billNo = billNo;
        this.seqNo = seqNo;
@@ -192,6 +222,11 @@
        this.modiTime = modiTime;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
        this.allQty=allQty;
        this.allWeight=allWeight;
        this.source=source;
        this.supplier=supplier;
        this.batchNumber=batchNumber;
    }

//    PltBarcode pltBarcode = new PltBarcode(
@@ -226,6 +261,14 @@
        this.barcode = barcode;
    }

    public double getAllWeight(){return allWeight;}

    public void setAllWeight(double allweight){this.allWeight=allweight;}

    public double getAllQty(){return allQty;}

    public void setAllQty(double allqty){this.allQty=allqty;}

    public String getBillNo() {
        return billNo;
    }
@@ -244,6 +287,20 @@

    public Integer getBillType() {
        return billType;
    }

    public String getSource$(){
        if (null == this.source){ return null; }
        switch (this.source){
            case 1:
                return "外协";
            case 2:
                return "自制";
            case 3:
                return "客供";
            default:
                return String.valueOf(this.source);
        }
    }

    public String getBillType$(){
@@ -340,13 +397,13 @@
        this.weight = weight;
    }

    public String getSupplier() {
        return supplier;
    }

    public void setSupplier(String supplier) {
        this.supplier = supplier;
    }
//    public String getSupplier() {
//        return supplier;
//    }
//
//    public void setSupplier(String supplier) {
//        this.supplier = supplier;
//    }

    public String getMemo() {
        return memo;

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -23,8 +23,11 @@

        // 产品数量
        private Double count;

        //批号
        private String supplier;

        //来源
        private Integer source;

        private String memo;

@@ -36,6 +39,14 @@
            this.seqNo = seqNo;
        }

        public Integer getSource() {
            return source;
        }

        public void setSource(Integer source) {
            this.source = source;
        }

        public String getMatNo() {
            return matNo;
        }

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -18,6 +18,7 @@

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Random;

/**
@@ -77,7 +78,7 @@
                pltBarcode.setUnit(matCode.getUnit());
                pltBarcode.setSpecs(matCode.getSpecs());
                pltBarcode.setSize(matCode.getSize());
                pltBarcode.setSupplier(combMat.getSupplier());
//                pltBarcode.setSupplier(combMat.getSupplier());
                pltBarcode.setMemo(combMat.getMemo());
                pltBarcode.setColor(matCode.getColor());
                pltBarcode.setLinkErp(0);
@@ -85,7 +86,17 @@
                pltBarcode.setModiTime(now);
                pltBarcode.setAppeUser(userId);
                pltBarcode.setAppeTime(now);

                if(matCode.getWeight()==null){
                    matCode.setWeight(0.0);
                }
                if(matCode.getStr6()==null){
                    matCode.setStr6(0.0);
                    pltBarcode.setAllQty(pltBarcode.getQty());
                }else {
                    pltBarcode.setAllQty(matCode.getStr6()*pltBarcode.getQty());
                }
                pltBarcode.setWeight(matCode.getWeight());
                pltBarcode.setAllWeight(matCode.getWeight()*pltBarcode.getQty()+30);
                if (!pltBarcodeService.insert(pltBarcode)) {
                    throw new CoolException("保存数据失败");
                }
@@ -94,6 +105,7 @@
            // 关联通知单组托
            for (CombParam.CombMat combMat : param.getCombMats()) {
                WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>()

                        .eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo()));

                if (waitMatin == null) {

 src/main/resources/application.yml

@@ -19,9 +19,9 @@
    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
    #username: sa
    #password: eisoft
    url: jdbc:sqlserver://47.97.1.152:51433;databasename=sxjzasrs
    url: jdbc:sqlserver://localhost:1433;databasename=sxjzasrs
    username: sa
    password: Zoneyung@zy56$
    password: sa@123
  mvc:
    static-path-pattern: /**
  redis:

 src/main/resources/mapper/PltBarcodeMapper.xml

@@ -11,12 +11,16 @@
        <result column="mat_no" property="matNo" />
        <result column="mat_name" property="matName" />
        <result column="qty" property="qty" />
        <result column="all_qty" property="allQty"/>
        <result column="loc_no" property="locNo" />
        <result column="specs" property="specs" />
        <result column="source" property="source"/>
        <result column="supplier" property="supplier"/>
        <result column="unit" property="unit" />
        <result column="size" property="size" />
        <result column="color" property="color" />
        <result column="weight" property="weight" />
        <result column="all_weight" property="allWeight"/>
        <result column="memo" property="memo" />
        <result column="link_erp" property="linkErp" />
        <result column="io_status" property="ioStatus" />

 src/main/webapp/static/js/pltBarcode/pltBarcode.js

@@ -28,12 +28,17 @@
            ,{field: 'matNo', align: 'center',title: '物料编码'}
            ,{field: 'matName', align: 'center',title: '物料名称'}
            ,{field: 'qty', align: 'center',title: '数量'}
            ,{field: 'allQty', align: 'center',title: '总数量'}
            ,{field: 'locNo', align: 'center',title: '库位号'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'size', align: 'center',title: '尺寸', hide: true}
            ,{field: 'color', align: 'center',title: '颜色', hide: true}
            ,{field: 'weight', align: 'center',title: '单重', hide: true}
            ,{field: 'weight', align: 'center',title: '单重' }
            ,{field: 'allWeight', align: 'center',title: '总重'}
            ,{field: 'source', align: 'center',title: '来源'}
            ,{field: 'supplier', align: 'center',title: '批号'}
            ,{field: 'batchNumber', align: 'center',title: '供应商'}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线', hide: true}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态'}

 src/main/webapp/views/pda/matQuery.html

@@ -96,6 +96,26 @@
        <span>生产日期</span>
        <input id="memo" type="text">
    </div>
<!--    <div class="form-item">-->
<!--        <span>来源</span>-->
<!--        <input id="source" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">-->
<!--    </div>-->
    <div class="layui-inline">
        <label class="layui-form-label">来源</label>
        <div class="layui-input-inline cool-auto-complete">
            <input id="source" name="source" class="layui-input" type="text" style="display: none">
            <input id="Source$" name="Source$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="matTypeBymatType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="matTypeBymatTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="form-item">
        <span>供应商</span>
        <input id="supplier1" type="text">
    </div>
    <div class="form-item">
        <span>单位</span>
        <input id="unit" type="text" disabled="disabled">

 version/db/sxjzasrs20211227.bak

Binary files differ