最新版本541200007

jiangping

2024-12-17 e58253672e2767831fc8be0ac248296d6af50e29

最新版本541200007

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java

@@ -37,7 +37,7 @@
@Api(tags = "【看板大屏】园区物流运行调度看板真实")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRunAct")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
public class PlatformJobRunActController extends BaseController {

    @Autowired

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java

@@ -40,7 +40,7 @@
@Api(tags = "【看板大屏】园区物流运行调度看板")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRunOld")
public class PlatformJobRunController extends BaseController {

    @Autowired

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseDataResponse.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author 江蹄蹄
 * @date 2023/11/23 14:03
@@ -16,5 +18,7 @@
    private String success;
    @ApiModelProperty(value = "消息描述" ,example = "1")
    private String msgDescr;
    @ApiModelProperty(value = "消息描述" ,example = "1")
    private List<WmsInventoryJsonResponse> json;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryDataResponse.java

@@ -1,9 +1,16 @@
package com.doumee.core.wms.model.response;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.BoardStockListVO;
import com.doumee.dao.web.response.platformReport.GeneralVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

/**
@@ -13,12 +20,436 @@
@Data
@ApiModel("WMS接口处理返回data参数")
public class WmsInventoryDataResponse {

    @ApiModelProperty(value = "是否接收成功 1成功 -1 失败" ,example = "1")
    private String success;
    @ApiModelProperty(value = "消息描述" ,example = "1")
    private String msgDescr;

    @ApiModelProperty(value = "消息描述" ,example = "1")
    private List<WmsInventoryJsonResponse> json;

    public static void main(String[] args) {
        String dd ="{\n" +
                "  \"data\": [\n" +
                "    {\n" +
                "      \"json\": [\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode019\",\n" +
                "          \"item_name\": \"黄山徽商新视界细支（芜湖）\",\n" +
                "          \"qty\": 1470,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028223744\",\n" +
                "          \"item_name\": \"黄山(记忆)\",\n" +
                "          \"qty\": 600,\n" +
                "          \"supplier_code\": \"01\",\n" +
                "          \"supplier_name\": \"蚌埠卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028123266\",\n" +
                "          \"item_name\": \"黄山硬记忆\",\n" +
                "          \"qty\": 45,\n" +
                "          \"supplier_code\": \"05\",\n" +
                "          \"supplier_name\": \"滁州卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028225175\",\n" +
                "          \"item_name\": \"黄山(新制皖烟)\",\n" +
                "          \"qty\": 41,\n" +
                "          \"supplier_code\": \"01\",\n" +
                "          \"supplier_name\": \"蚌埠卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028223980\",\n" +
                "          \"item_name\": \"黄山(印象一品)\",\n" +
                "          \"qty\": 8119,\n" +
                "          \"supplier_code\": \"07\",\n" +
                "          \"supplier_name\": \"重庆中烟工业有限责任公司\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028125321\",\n" +
                "          \"item_name\": \"黄山(中国画细支)\",\n" +
                "          \"qty\": 570,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028223980\",\n" +
                "          \"item_name\": \"黄山(印象一品)\",\n" +
                "          \"qty\": 9701,\n" +
                "          \"supplier_code\": \"01\",\n" +
                "          \"supplier_name\": \"蚌埠卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"FYWL02\",\n" +
                "          \"item_name\": \"非烟物料02\",\n" +
                "          \"qty\": 2,\n" +
                "          \"supplier_code\": \"03\",\n" +
                "          \"supplier_name\": \"合肥卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028131605\",\n" +
                "          \"item_name\": \"黄山(大红方印)\",\n" +
                "          \"qty\": 190,\n" +
                "          \"supplier_code\": \"05\",\n" +
                "          \"supplier_name\": \"滁州卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode009\",\n" +
                "          \"item_name\": \"黄山徽商新概念细支（芜湖）\",\n" +
                "          \"qty\": 25500,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode009\",\n" +
                "          \"item_name\": \"黄山徽商新概念细支（芜湖）\",\n" +
                "          \"qty\": 600,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Semifinished\",\n" +
                "          \"itemType_name\": \"在制品\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028223980\",\n" +
                "          \"item_name\": \"黄山(印象一品)\",\n" +
                "          \"qty\": 2722,\n" +
                "          \"supplier_code\": \"05\",\n" +
                "          \"supplier_name\": \"滁州卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028208949\",\n" +
                "          \"item_name\": \"黄山(红方印细支)\",\n" +
                "          \"qty\": 2090,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode028\",\n" +
                "          \"item_name\": \"25合肥新制皖纸箱备货\",\n" +
                "          \"qty\": 5430,\n" +
                "          \"supplier_code\": \"03\",\n" +
                "          \"supplier_name\": \"合肥卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"FYWL01\",\n" +
                "          \"item_name\": \"非烟物料01\",\n" +
                "          \"qty\": 1,\n" +
                "          \"supplier_code\": \"\",\n" +
                "          \"supplier_name\": \"\",\n" +
                "          \"owner_code\": \"\",\n" +
                "          \"owner_name\": \"\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028129664\",\n" +
                "          \"item_name\": \"黄山(大黄山)\",\n" +
                "          \"qty\": 370,\n" +
                "          \"supplier_code\": \"01\",\n" +
                "          \"supplier_name\": \"蚌埠卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028125970\",\n" +
                "          \"item_name\": \"黄山(徽商新概念细支)\",\n" +
                "          \"qty\": 6876,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode020\",\n" +
                "          \"item_name\": \"黄山红方印细支（芜湖）\",\n" +
                "          \"qty\": 3160,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"cailiao001\",\n" +
                "          \"item_name\": \"机械手和分拣线的材料\",\n" +
                "          \"qty\": 1,\n" +
                "          \"supplier_code\": \"07\",\n" +
                "          \"supplier_name\": \"重庆中烟工业有限责任公司\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode008\",\n" +
                "          \"item_name\": \"新制皖（蚌埠）\",\n" +
                "          \"qty\": 30,\n" +
                "          \"supplier_code\": \"01\",\n" +
                "          \"supplier_name\": \"蚌埠卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode010\",\n" +
                "          \"item_name\": \"大红方印（滁州）\",\n" +
                "          \"qty\": 140,\n" +
                "          \"supplier_code\": \"05\",\n" +
                "          \"supplier_name\": \"滁州卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028124966\",\n" +
                "          \"item_name\": \"黄山(小红方印)\",\n" +
                "          \"qty\": 3466,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028126007\",\n" +
                "          \"item_name\": \"黄山(新一品)\",\n" +
                "          \"qty\": 14219,\n" +
                "          \"supplier_code\": \"05\",\n" +
                "          \"supplier_name\": \"滁州卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode021\",\n" +
                "          \"item_name\": \"都宝（悠酷中支）芜湖\",\n" +
                "          \"qty\": 175,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"cailiao002\",\n" +
                "          \"item_name\": \"分拣线材料\",\n" +
                "          \"qty\": 2,\n" +
                "          \"supplier_code\": \"03\",\n" +
                "          \"supplier_name\": \"合肥卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"NoBarCode011\",\n" +
                "          \"item_name\": \"黄山小红方印（芜湖）\",\n" +
                "          \"qty\": 4060,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028124058\",\n" +
                "          \"item_name\": \"黄山(黑马细支)\",\n" +
                "          \"qty\": 201,\n" +
                "          \"supplier_code\": \"02\",\n" +
                "          \"supplier_name\": \"芜湖卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"EmptyContainer\",\n" +
                "          \"item_name\": \"空托盘组\",\n" +
                "          \"qty\": 20561,\n" +
                "          \"supplier_code\": \"\",\n" +
                "          \"supplier_name\": \"\",\n" +
                "          \"owner_code\": \"\",\n" +
                "          \"owner_name\": \"\",\n" +
                "          \"package_type\": \"\",\n" +
                "          \"package_name\": \"\",\n" +
                "          \"itemType_code\": \"\",\n" +
                "          \"itemType_name\": \"\"\n" +
                "        },\n" +
                "        {\n" +
                "          \"item_code\": \"6901028223980\",\n" +
                "          \"item_name\": \"黄山(印象一品)\",\n" +
                "          \"qty\": 10,\n" +
                "          \"supplier_code\": \"04\",\n" +
                "          \"supplier_name\": \"阜阳卷烟厂\",\n" +
                "          \"owner_code\": \"20340001\",\n" +
                "          \"owner_name\": \"安徽中烟工业有限公司\",\n" +
                "          \"package_type\": \"BoxType_Paper\",\n" +
                "          \"package_name\": \"纸箱\",\n" +
                "          \"itemType_code\": \"ItemStatus_Production\",\n" +
                "          \"itemType_name\": \"成品类\"\n" +
                "        }\n" +
                "      ],\n" +
                "      \"success\": 1,\n" +
                "      \"msgDescr\": \"OK\"\n" +
                "    }\n" +
                "  ]\n" +
                "}";

        TypeReference< WmsBaseResponse<WmsInventoryDataResponse>> typeReference =     new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){};
        WmsBaseResponse<WmsInventoryDataResponse>  response =   JSONObject.parseObject(dd, typeReference.getType());

        BoardStockListVO data = new BoardStockListVO();
        double toatalNum = 1d;
        BigDecimal num = new BigDecimal(0);
        List<GeneralVO> list = new ArrayList<>();
        try {
            toatalNum =100000;
        }catch (Exception e){
        }
        if(response!=null && response.getData()!=null && response.getData().size()>0){
            List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
            if(t!=null &&t.size()>0){
                for(WmsInventoryJsonResponse j :t){
                    num = num.add (Constants.formatBigdecimal( j.getQty()));
                    GeneralVO d = new GeneralVO();
                    d.setNum(Constants.formatBigdecimal(j.getQty()));
                    d.setName(j.getItemName());
                    list.add(d);
                }
            }
        }
        data.setStockList(list);
        data.setNum(num);
        if(toatalNum<=0){
            toatalNum =1;
        }
        data.setTotalNum(new BigDecimal(toatalNum));
        data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_UP));

        System.out.println(data.getNum());

    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryJsonResponse.java

@@ -1,5 +1,6 @@
package com.doumee.core.wms.model.response;

import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,29 +16,38 @@
@ApiModel("WMS接口处理返回data参数")
public class WmsInventoryJsonResponse {

    @ApiModelProperty(value = "是否接收成功 1成功 -1 失败" ,example = "1")
    private String item_code;
    @ApiModelProperty(value = "消息描述" ,example = "1")
    private String item_name;
    @ApiModelProperty(value = "qty" ,example = "1")
    @ApiModelProperty(value = "item_code" )
    @JSONField(name="item_code" )
    private String itemCode;
    @ApiModelProperty(value = "item_name" )
    @JSONField(name="item_name" )
    private String itemName;
    @ApiModelProperty(value = "qty" )
    @JSONField(name="qty" )
    private BigDecimal qty;
    @ApiModelProperty(value = "supplier_code" ,example = "1")
    private String  supplier_code;
    @ApiModelProperty(value = "g" ,example = "1")
    private String  supplier_name;
    @ApiModelProperty(value = "owner_code" ,example = "1")
    private String  owner_code;
    @ApiModelProperty(value = "owner_name" ,example = "1")
    private String  owner_name;
    @ApiModelProperty(value = "package_type" ,example = "1")
    private String  package_type;
    @ApiModelProperty(value = "package_name" ,example = "1")
    private String  package_name;
    @ApiModelProperty(value = "itemType_code" ,example = "1")
    private String  itemType_code;
    @ApiModelProperty(value = "ItemStatus_Production" ,example = "1")
    private String  ItemStatus_Production;
    @ApiModelProperty(value = "itemType_name" ,example = "1")
    private String  itemType_name;
    @ApiModelProperty(value = "supplier_code" )
    @JSONField(name="supplier_code" )
    private String  supplierCode;
    @ApiModelProperty(value = "supplier_name" )
    @JSONField(name="supplier_name" )
    private String  supplierName;
    @ApiModelProperty(value = "owner_code" )
    @JSONField(name="owner_code" )
    private String  ownerCode;
    @ApiModelProperty(value = "owner_name" )
    @JSONField(name="owner_name" )
    private String  ownerName;
    @ApiModelProperty(value = "package_type" )
    @JSONField(name="package_type" )
    private String  packageType;
    @ApiModelProperty(value = "package_name" )
    @JSONField(name="package_name" )
    private String  packageName;
    @ApiModelProperty(value = "itemTypeCode" )
    @JSONField(name="itemTypeCode" )
    private String  itemTypeCode;
    @ApiModelProperty(value = "itemType_name" )
    @JSONField(name="itemType_name" )
    private String  itemTypeName;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java

@@ -40,8 +40,6 @@
        approveParamMapper.insert(approveParam);
        return approveParam.getId();
    }


    /**
     * 验证数据必填
     * @param approveParam

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -20,7 +20,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsInventoryJsonResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
@@ -161,9 +161,8 @@
        try {
            toatalNum =Double.parseDouble(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_TOTAL_STOCK_NUM).getCode()) ;
        }catch (Exception e){

        }
        WmsBaseResponse<WmsInventoryDataResponse> response =  wmsService.getInventoryList();
        WmsBaseResponse<WmsBaseDataResponse> response =  wmsService.getInventoryList();
        if(response!=null && response.getData()!=null && response.getData().size()>0){
            List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
            if(t!=null &&t.size()>0){
@@ -171,7 +170,7 @@
                    num = num.add (Constants.formatBigdecimal( j.getQty()));
                    GeneralVO d = new GeneralVO();
                    d.setNum(Constants.formatBigdecimal(j.getQty()));
                    d.setName(j.getItem_name());
                    d.setName(j.getItemName());
                    list.add(d);
                }
            }
@@ -182,7 +181,7 @@
            toatalNum =1;
        }
        data.setTotalNum(new BigDecimal(toatalNum));
        data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_UP));
        data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_HALF_UP));
        return data;

    }
@@ -730,7 +729,11 @@
                        .selectAll(PlatformJob.class)
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getCarCodeFront,param.getCarCode())
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
                        .in(PlatformJob::getStatus,
                                Constants.PlatformJobStatus.DONE.getKey(),
                                Constants.PlatformJobStatus.LEAVED.getKey(),
                                Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
                                Constants.PlatformJobStatus.CALLED.getKey())
                        .last("limit 1"));
        if(job!=null){
            List<PlatformLog>  logList = platformLogMapper.selectJoinList(PlatformLog.class,
@@ -770,7 +773,7 @@
                                .orderByDesc(PlatformLog::getCreateDate));
                if(detailList!=null){
                    for(PlatformWmsDetail d : detailList){
                        if(!isNotExistIocode(d.getIocode(),data.getContractList())){
                        if(isExistIocode(d.getIocode(),data.getContractList())){
                                continue;
                        }
                        tt = new CarsContractVO();
@@ -805,7 +808,7 @@
        return list;
    }

    private boolean isNotExistIocode(String iocode, List<CarsContractVO> detailList) {
    private boolean isExistIocode(String iocode, List<CarsContractVO> detailList) {
        if(detailList!=null){
            for(CarsContractVO d :detailList){
                if(StringUtils.equals(d.getIoCode(),iocode)){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java

@@ -11,7 +11,7 @@
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
@@ -145,10 +145,10 @@
     * @return
     */
    @Override
    public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
    public WmsBaseResponse<WmsBaseDataResponse> getInventoryList(){
         String url =  systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
         String name = "【WMS】库存查询" ;
         WmsBaseResponse<WmsInventoryDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){});
         WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
        if(response!=null
                && response.getData() !=null
                && response.getData().size()>0
@@ -214,6 +214,7 @@
                return  result;
            }catch (Exception e){
                success = 1;
                e.printStackTrace();
                log.error("【"+name+"】================失败===="+ JSONObject.toJSONString(param));
            }finally {
                saveInterfaceLog(url,name,param,success,res,Constants.ZERO);
@@ -344,8 +345,6 @@
                    }
                }
            }


        }
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java

@@ -5,7 +5,7 @@
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.dao.business.model.PlatformJob;

import java.util.List;
@@ -22,7 +22,7 @@
     * @return WmsBaseResponse
     */
    WmsBaseResponse orderPlatformBind(PlatformJob job);
    WmsBaseResponse<WmsInventoryDataResponse> getInventoryList();
    WmsBaseResponse<WmsBaseDataResponse> getInventoryList();
    void  saveInterfaceLog(String url,String name,String  param,Integer success,String respone,int type);
    /**
     * 入库单批量通知