1

ZY

2024-10-30 67cb49032b0efff478b2432713d62c305e4e53ce

1

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

@@ -1,13 +1,17 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.param.CheckParam;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.param.OrderProdSyncParam;
import com.zy.asrs.entity.param.OrderSyncParam;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,16 +37,17 @@
    }};



    @Autowired
    private OpenService openService;

    @Autowired
    private DocTypeService docTypeService;

    /**
     * 库存统计
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
    public R queryStock(@RequestHeader(required = false) String appkey, HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
    }
@@ -52,9 +57,7 @@
     */
    @PostMapping("/mat/v1")
    @AppAuth(memo = "物料同步接口")
    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -64,8 +67,6 @@
        return R.ok("更新成功");

    }




    private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -85,19 +86,26 @@

    @PostMapping("/order/pak/default/v1")
    @AppAuth(memo = "生成退货补货单据")
    public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = true) OrderSyncParam param,
                                     HttpServletRequest request){
    public synchronized R orderAccept(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
        log.info("生成退货补货单据,{}",JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        String docName = param.get操作单据();
        boolean pakin = param.getPakin() == 1 ? true : false;

        openService.syncOrder(param,pakin,docName);
        DocType type = getType(param.get操作单据(), param.getChildren().get(0).getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getPakin() == 1) {
                openService.syncOrder(param, true, type.getDocName());
            } else {
                openService.syncOrder(param, false, type.getDocName());
            }
        } else {
            return R.ok("单据接受失败，不是约定的单据l类型");
        }
//        String docName = param.get操作单据();
//        boolean pakin = param.getPakin() == 1 ? true : false;
//
//        openService.syncOrder(param, pakin, docName);

        return R.ok("单据接受成功");

@@ -105,20 +113,26 @@

    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "生成入库单据")
    public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = true) OrderSyncParam param,
                                        HttpServletRequest request){
    public synchronized R orderPakin(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
        log.info("生成入库单据,{}",JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "银座采购入库单" : "银座采购退货单";
        boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//        String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "银座采购入库单" : "银座采购退货单";
//        boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;

        openService.syncOrder(param,pakin,docName);

        DocType type = getType(param.get操作单据(), param.getChildren().get(0).getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getPakin() == 1) {
                openService.syncOrder(param, true, type.getDocName());
            } else {
                openService.syncOrder(param, false, type.getDocName());
            }
        } else {
            return R.ok("单据接受失败，不是约定的单据l类型");
        }
        return R.ok("单据接受成功");

    }
@@ -128,9 +142,7 @@
     */
    @PostMapping("/check/default/v1")
    @AppAuth(memo = "库存盘点")
    public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = true) CheckParam param,
                                     HttpServletRequest request){
    public synchronized R checkLoc(@RequestHeader(required = false) String appkey, @RequestBody(required = true) CheckParam param, HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -147,29 +159,51 @@
    @AppAuth(memo = "同步工单单据")
    public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
                                      //@RequestBody(required = false) HashMap<String,Object> param,
                                     @RequestBody(required = false) OrderProdSyncParam param,
                                     HttpServletRequest request){
                                      @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
        log.info("同步工单单据,{}",JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if(!Cools.eq("生产",param.getCVouchtype())){
            String docName = param.getIQuantity() > 0 ?  "银座委外入库单" : "银座委外入库退货单";
            boolean pakin = param.getIQuantity() > 0 ? true : false;
            mappingPakInOrderParam(param,pakin,docName);

        DocType type = getType(param.get操作单据(), param.getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getDocName().equals("MO")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                mappingPakOutOrderParam(param, false, "银座委外材料出库单");
            } else if (type.getDocName().equals("OM")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                mappingPakOutOrderParam(param, false, "银座生产材料出库单");
            } else {
                if (type.getPakin() == 1) {
                    mappingPakInOrderParam(param, true, type.getDocName());
            if(!Cools.isEmpty(param.getChildren())){
                String docName1 = param.getChildren().get(0).getIQuantity() > 0 ?  "银座委外材料出库单" : "银座委外材料退料单";
                boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
                mappingPakOutOrderParam(param,pakin1,docName1);
                        mappingPakOutOrderParam(param, false, type.getDocName());
                    }
                } else {
                    mappingPakOutOrderParam(param, false, type.getDocName());
                }
            }
        } else {
            return R.ok("单据接受失败，不是约定的单据l类型");
            }

        }else if(!Cools.isEmpty(param.getChildren())) {
            String docName1 = param.getChildren().get(0).getIQuantity() > 0 ?  "银座生产材料出库单" : "银座生产材料退料单";
            boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
            mappingPakOutOrderParam(param,pakin1,docName1);
        }
//        if (!Cools.eq("生产", param.getCVouchtype())) {
//            String docName = param.getIQuantity() > 0 ? "银座委外入库单" : "银座委外入库退货单";
//            boolean pakin = param.getIQuantity() > 0 ? true : false;
//            mappingPakInOrderParam(param, pakin, docName);
//
//            if (!Cools.isEmpty(param.getChildren())) {
//                String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座委外材料出库单" : "银座委外材料退料单";
//                boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//                mappingPakOutOrderParam(param, pakin1, docName1);
//            }
//
//        } else if (!Cools.isEmpty(param.getChildren())) {
//            String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座生产材料出库单" : "银座生产材料退料单";
//            boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//            mappingPakOutOrderParam(param, pakin1, docName1);
//        }

        return R.ok("单据接受成功");

@@ -177,9 +211,7 @@

    @PostMapping("/order/delete/default/v1")
    @AppAuth(memo = "单据删除审核")
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) Map<String, Object> param,
                                      HttpServletRequest request){
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) Map<String, Object> param, HttpServletRequest request) {
        log.info("单据删除审核,{}",JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
@@ -259,4 +291,57 @@
        //return orderSyncParam;
    }


    private DocType getType(String type, Double iQuantity) {
        DocType docType = new DocType();
        switch (type) {
            case "Purchase":
                docType.setDocName("银座采购入库单");
                docType.setPakin(1);
                break;
            case "MO":
                docType.setDocName("银座生产订单");
                docType.setPakin(0);
                break;
            case "OM":
                docType.setDocName("银座委外生产订单");
                docType.setPakin(0);
                break;
            case "采购入库单退货":
                docType.setDocName("银座采购入库单退货单");
                docType.setPakin(0);
                break;
            case "委外入库单退货":
                docType.setDocName("银座委外入库单退货单");
                docType.setPakin(1);
                break;
            case "生产材料出库退料":
                docType.setDocName("银座生产材料出库退料单");
                docType.setPakin(1);
                break;
            case "委外材料出库退料":
                docType.setDocName("银座委外材料出库退料单");
                docType.setPakin(1);
                break;
            case "生产材料出库补料":
                docType.setDocName("银座生产材料出库补料单");
                docType.setPakin(0);
                break;
            case "委外材料出库补料":
                docType.setDocName("银座委外材料出库补料单");
                docType.setPakin(0);
                break;
            case "其他入库单":
                docType.setDocName("银座其他入库单");
                docType.setPakin(1);
                break;
            case "其他出库单":
                docType.setDocName("银座其他出库单");
                docType.setPakin(0);
                break;
            default:
                docType = docTypeService.selectOrAdd(type, iQuantity > 0);
        }
        return docType;
    }
}

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

@@ -129,7 +129,7 @@
            if (this == object) return true;
            if (object == null || getClass() != object.getClass()) return false;
            OrderDetl orderDetl = (OrderDetl) object;
            return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
            return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(batch, orderDetl.batch) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
        }

        @Override

 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java

@@ -23,7 +23,7 @@
     */
    OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);

    OrderDetl selectItemByOrderNo2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("threeCode") String threeCode);
    OrderDetl selectItemByOrderNo2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("threeCode") String threeCode);

    OrderDetl selectItemNoneOfBatch(@Param("orderNo")String orderNo, @Param("matnr")String matnr);


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

@@ -18,7 +18,7 @@

    OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode);

    OrderDetl selectItem(String orderNo, String matnr, String threeCode);
    OrderDetl selectItem(String orderNo, String matnr, String batch,String threeCode);

    OrderDetl selectItemNoneOfBatch(String orderNo, String matnr);


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

@@ -595,7 +595,7 @@
            agvWaitPakinList.forEach(wp -> {
                createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
                // 流水 -- 新增订单明细
                OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());
                OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(),wp.getBatch(), wp.getThreeCode());
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setSpare2(wrkMast.getWrkNo().toString());

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

@@ -611,6 +611,7 @@
            }
        }
    }

    @Override
    @Transactional
    public Mat syncMat(MatSyncParam param) {
@@ -741,6 +742,7 @@
        }
        callApiLogSaveMES(param, param.getCombMats().get(0),"组托成功", true);
    }

    public void callApiLogSaveMES(CombParam combParam,CombParam.CombMat combMat, String response, Boolean bool) {
        if (Cools.isEmpty(combParam)){
            apiLogService.save("MES下发入库通知单", "/open/asrs/comb/v1", "null", "10.10.10.1",
@@ -856,7 +858,6 @@
                param.setMemo("添加ERP下发商品信息失败！");
            }
        }



        return true;
@@ -1035,7 +1036,7 @@
        //销售订单号
        od.setThreeCode(odParam.getCDefine22());
        //自由项
        od.setBatch(odParam.getBFree1());
        od.setBatch(Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch() + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
        //IDs
        od.setSku(odParam.getId());


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

@@ -48,8 +48,8 @@
    }

    @Override
    public OrderDetl selectItem(String orderNo, String matnr, String threeCode) {
        return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, threeCode);
    public OrderDetl selectItem(String orderNo, String matnr,String batch, String threeCode) {
        return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
    }

    @Override

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

@@ -92,7 +92,7 @@
    @Transactional
    public void timelyStart(Order order) {

        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单","其他入库单","其他出库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (docNames.contains(docType.getDocName())) {
@@ -146,10 +146,22 @@
            childInfo.setIrowno(orderDetl.getItemNum());
            childInfo.setCInvCode(orderDetl.getMatnr());
            childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
            childInfo.setCBatch(orderDetl.getBatch());
            String batch = orderDetl.getBatch();
            if (Cools.isEmpty(batch)) {
                childInfo.setCBatch("");
                childInfo.setBFree1("");
            } else {
                String[] s = batch.split("__");
                if (s.length > 1) {
                    childInfo.setCBatch(s[0]);
                    childInfo.setBFree1(s[1]);
                } else {
                    childInfo.setCBatch(s[0]);
                    childInfo.setBFree1("");
                }
            }
            childInfo.setINum(orderDetl.getLength() + "");
            childInfo.setIinvexchrate("");
            childInfo.setBFree1(orderDetl.getDeadTime());
            childInfo.setIPOsID(orderDetl.getSku());
            childInfo.setCOrderCode(orderDetl.getOrderNo());
            childInfo.setIvouchrowno(orderDetl.getItemNum());
@@ -159,6 +171,7 @@
        }

    }


    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
        String response = "";
@@ -181,7 +194,7 @@
            success = true;
            return code;
        } catch (Exception e) {
            log.error(e.getMessage());
            log.error("报错信息:{},{}", e.getMessage(), JSON.toJSONString(requestParam));
            throw new CoolException("调用接口响应错误");
        } finally {
            apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -101,6 +101,14 @@
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
            </when>
            <otherwise>
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
        <if test="threeCode!=null and threeCode!='' ">
            and three_code = #{threeCode}
        </if>