cp
2024-10-24 50acd5996ba9f88bbfd4341855c38b625598a190
打印添加制令,晚上订单上报
6个文件已修改
22 ■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
@@ -20,4 +20,6 @@
    @ExcelProperty(index = 1, value = "打印数量")
    private String anfme;
    @ExcelProperty(index = 2, value = "制令")
    private String decrees;
}
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
@@ -81,6 +81,12 @@
        } catch (Exception e){
            matax = "";
        }
        String decrees = "";
        try{
            decrees =  excel.getDecrees();
        } catch (Exception e){
            decrees = "";
        }
        String anfme = "1";
        try{
            String anfme1 = excel.getAnfme();
@@ -97,10 +103,11 @@
        } catch (Exception e){
            anfme = "1";
        }
        String[] s=new String[3];
        String[] s=new String[4];
        s[0] = matnr;
        s[1] = matax;
        s[2] = anfme;
        s[3] = decrees;
        printMatList.add(s);
        total++;
        totalAnfme = totalAnfme+Integer.parseInt(anfme);
@@ -119,6 +126,7 @@
                String matnr = printMat[0];
                String matax = printMat[1];
                String anfme = printMat[2];
                String decrees = printMat[3];
                Integer intAnfme = 1;
                try{
                    Integer intAnfme1 = Integer.parseInt(anfme);
@@ -135,6 +143,7 @@
                    locInPrintMat.setUpdateBy(userId);
                    locInPrintMat.setCreateTime(now);
                    locInPrintMat.setUpdateTime(now);
                    locInPrintMat.setDecrees(decrees);
                    locInPrintMatService.save(locInPrintMat);
                }
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
@@ -116,6 +116,9 @@
    @ApiModelProperty(value= "商品名称")
    private Long ownerId;
    @ApiModelProperty(value="制令")
    private String decrees;
    public LocInPrintMat() {}
    public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java
@@ -42,7 +42,7 @@
    @Autowired
    private LocDetlService locDetlService;
    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    public void orderComplete() {
        //订单完成上报
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -233,7 +233,7 @@
            print.setMemo(mat.getMemo());
            print.setMaterial(mat.getMaterial());
            print.setDecrees(mat.getDecrees());
            print.setDecrees(locInPrintMat.getDecrees());
            print.setImgNum(mat.getImgNum());
            print.setWeight(String.valueOf(mat.getWeight()));
            print.setModel(mat.getModel());
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -79,7 +79,7 @@
                    log.error("", e); }
            }
        }
        if (success){
        if (!success){
            return FAIL.setMsg("上報失敗");
        }
        return SUCCESS;