#

yxFwq

2024-08-09 4cfee88fa7fad14de4908e1776ebd044d0c4e87f

#

 src/main/java/com/zy/asrs/controller/SiteController.java

@@ -144,7 +144,7 @@
    /************************** 详情操作 ******************************/
    /****************************************************************/

    @GetMapping("/detl/{siteId}")
    @GetMapping("/detl/wcs/{siteId}")
    public R siteDetl(@PathVariable("siteId") Integer siteId){
        SiteTableVo vo = new SiteTableVo();
        for (DevpSlave devp : slaveProperties.getDevp()) {

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

@@ -60,7 +60,7 @@
    private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};

    private static final Integer jarMaxLoc = 7;
    private static final Float jarTemperature = 50F;
    private static final Float jarTemperature = 80F;
    @Autowired
    private CommonService commonService;
    @Autowired

 src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java

@@ -34,7 +34,7 @@
        }
    }

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){//上传开式冷却信号
        int[] jarList =new int[]{1,2,3,4,5,6};
        for (int jarNo : jarList){

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

@@ -126,7 +126,7 @@
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("Code")==200) {
                if (jsonObject.getInteger("code")==200) {
                    success = true;
                } else {
                    log.error("1楼翻转重量信息上传请求接口失败！！！url：{}；request：{}；response：{}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);

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

@@ -70,6 +70,7 @@
                if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
                    if (Cools.isEmpty(wrkMast)) return FAIL;
                    if (wrkMast.getSheetNo().equals("2")) return FAIL;
                    if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo()=="2") return FAIL;
                    List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                    WrkDetl wrkDetl = null;

 src/main/webapp/views/pipeline.html

@@ -412,7 +412,7 @@
                closeBtn: 0,
                content: $("#site-detl"),
                success: function(layero, index){
                    http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
                    http.get(baseUrl+ "/site/detl/wcs/"+siteId, null, function (res) {
                        $('#siteId').val(siteId);
                        $('#workNo').val(res.data.workNo);
                        $('#staNo').val(res.data.staNo);