#导入库位覆盖

zyx

2024-03-25 ed280b0c12e61284048aecea6f0649ffb03fffb1

#导入库位覆盖

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

@@ -295,13 +295,13 @@
        if (Cools.isEmpty(this.pakinTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH").format(this.pakinTime);
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pakinTime);
    }

    public String getStockFreezeDate$() {
        if (Cools.isEmpty(this.stockFreezeDate)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.stockFreezeDate);
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate);
    }
}

 src/main/java/com/zy/asrs/utils/PlaExcelListener.java

@@ -93,7 +93,9 @@
            excel.setStatus(pla.getStatus());
            excel.setPakinTime(pla.getPakinTime());
            excel.setStash(pla.getStash());
            excel.setLocNo(pla.getLocNo());
            if(Cools.isEmpty(excel.getLocNo())){
                excel.setLocNo(pla.getLocNo());
            }
            BeanUtils.copyProperties(excel,pla);
            pla = plaCreate(pla,excel,matService,nodeService);
            try {