Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

pang.jiabao

2024-11-02 e589ffc0b6009b3c69bb356a9ed102773cfb8474

Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

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

@@ -82,7 +82,7 @@
//            return R.ok();
//        }
        String sta = (String) map.get("sta"); // 暂存位
        String inSta = (String) map.get("inSta"); // 入库站点
        String inSta = String.valueOf(map.get("inSta")); // 入库站点

        return mobileService.inLocCallAgv(sta, inSta);


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

@@ -39,6 +39,21 @@
    private WrkMastService wrkMastService;


    @PostMapping("/tagSync/v1")
    @AppAuth(memo = "物料分类同步")
    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) List<TagParam> param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.syncTag(param);
        return R.ok();

    }


    @PostMapping("/wrkMast/finish/v1")
    @AppAuth(memo = "四向车任务完成")
    public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,

 src/main/java/com/zy/asrs/entity/param/TagParam.java

New file
@@ -0,0 +1,11 @@
package com.zy.asrs.entity.param;

import lombok.Data;

import java.util.List;

@Data
public class TagParam {
    private String parentTagName;
    private String tagName;
}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -47,4 +47,6 @@
    boolean agvHaiKang(String wrkNo);

    List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param);

    void syncTag(List<TagParam> param);
}

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

@@ -585,7 +585,7 @@
                        if (!Cools.isEmpty(order)) {
                            locDetlByTimeDTO.setDate(order.getOrderTime());
                            locDetlByTimeDTO.setWarehouse(order.getItemName());
                            locDetlByTimeDTO.setOrderType(order.getDocType().toString());
                            locDetlByTimeDTO.setOrderType(order.getDocType$());
                        }
                        locDetlByTimeDTO.setMatnr(wrkDetlLog.getMatnr());
                        locDetlByTimeDTO.setLocNo(wrkMastLog.getIoType() <100? wrkMastLog.getLocNo(): wrkMastLog.getSourceLocNo());
@@ -633,4 +633,9 @@
        return true;
    }

    @Override
    @Transactional
    public void syncTag(List<TagParam> param) {

    }
}

 src/main/webapp/static/js/order/order.js

@@ -48,6 +48,7 @@
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
            {field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160},
            {field: 'shipName', align: 'center',title: '制单人'},
            {field: 'itemName', align: 'center',title: '仓库'},
            {field: 'memo', align: 'center',title: '备注', hide: true},
            {align: 'center', title: '操作', toolbar: '#operate', width: 180}
        ]],