#

1

4 天以前 4d0d1312f0782bd90cec598a6125fe503b0fd727

#

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

@@ -119,6 +119,13 @@
    @TableField("arm_msg")
    private String armMsg;

    /**
     * 异常信息
     */
    @ApiModelProperty(value= "条码")
    @TableField("barcode")
    private String barcode;

    public BasArmMast() {}
    public BasArmMast(TaskArmReportParam param) {
        this.orderNo = param.getOrderNo();

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

@@ -55,7 +55,7 @@
     */
    @ApiModelProperty(value= "绑定标记")
    @TableField("binding_tags")
    private Integer bindingTags;
    private Long bindingTags;

    /**
     * 优先级
@@ -118,9 +118,16 @@
    @TableField("arm_msg")
    private String armMsg;

    /**
     * 异常信息
     */
    @ApiModelProperty(value= "条码")
    @TableField("barcode")
    private String barcode;

    public BasArmMastLog() {}

    public BasArmMastLog(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Integer bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
    public BasArmMastLog(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Long bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
        this.armNo = armNo;
        this.armDirection = armDirection;
        this.staNo = staNo;
@@ -139,6 +146,26 @@
        this.armError = armError;
        this.armMsg = armMsg;
    }
    public BasArmMastLog(BasArmMast basArmMast) {
        this.armNo = basArmMast.getArmNo();
        this.armDirection = basArmMast.getArmDirection();
        this.staNo = basArmMast.getStaNo();
        this.sortingLine = basArmMast.getSortingLine();
        this.bindingTags = basArmMast.getBindingTags();
        this.priority = basArmMast.getPriority();
        this.status = basArmMast.getStatus();
        this.matnr = basArmMast.getMatnr();
        this.sku = basArmMast.getSku();
        this.po = basArmMast.getPo();
        this.upc = basArmMast.getUpc();
        this.supplier = basArmMast.getSupplier();
        this.orderNo = basArmMast.getOrderNo();
        this.ctns = basArmMast.getCtns();
        this.createTime = basArmMast.getCreateTime();
        this.armError = basArmMast.getArmError();
        this.armMsg = basArmMast.getArmMsg();
        this.barcode = basArmMast.getBarcode();
    }

//    BasArmMastLog basArmMastLog = new BasArmMastLog(
//            null,    // 机械臂编号[非空]

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -133,8 +130,9 @@
    @Transactional
    public ReturnT<String> startArm(BasArmMast basArmMast) {
        try {
            BasArmMastLog basArmMastLog = new BasArmMastLog(basArmMast);
            // 保存工作主档历史档
            if (!basArmMastLogService.save(basArmMast.getId())) {
            if (!basArmMastLogService.insert(basArmMastLog)) {
                exceptionHandle("保存ARM工作历史档[id={0}]失败", basArmMast.getId());
            }
            // 删除工作主档

 src/main/resources/mapper/BasArmMastLogMapper.xml

@@ -22,6 +22,7 @@
        <result column="create_time" property="createTime" />
        <result column="arm_error" property="armError" />
        <result column="arm_msg" property="armMsg" />
        <result column="barcode" property="barcode" />

    </resultMap>


 src/main/resources/mapper/BasArmMastMapper.xml

@@ -22,6 +22,7 @@
        <result column="create_time" property="createTime" />
        <result column="arm_error" property="armError" />
        <result column="arm_msg" property="armMsg" />
        <result column="barcode" property="barcode" />

    </resultMap>