*

lsh

16 小时以前 cc4769108b9b98fabf48a91033c8df90a396e061

*

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

@@ -391,46 +391,50 @@
    @RequestMapping(value = "/synchronize/mes/locDetl/report/auth")
    @ManagerAuth(memo = "同步库存至MES")
    public R synchronizeLocDetlMes() {
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
        if (locDetlList.isEmpty()) {
            return R.error("库存为空！！！");
        }
        try{
            List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
            if (locDetlList.isEmpty()) {
                return R.error("库存为空！！！");
            }

        OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","成品入库");
        orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
        orderMesXGHYParam.setPalletizingNo(1);
            OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","成品入库");
            orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
            orderMesXGHYParam.setPalletizingNo(1);


        String response = "";
        boolean success = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(productInventoryUrl)
                    .setPath(productInventory)
                    .setJson(JSON.toJSONString(orderMesXGHYParam))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getBoolean("state")) {
                success = true;
            } else {
                return R.error("同步库存至MES");
            String response = "";
            boolean success = false;
            try {
                response = new HttpHandler.Builder()
                        .setUri(productInventoryUrl)
                        .setPath(productInventory)
                        .setJson(JSON.toJSONString(orderMesXGHYParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getBoolean("state")) {
                    success = true;
                } else {
                    return R.error("同步库存至MES");
                }
            } catch (Exception e) {
                return R.error("同步库存至MES"+e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "同步库存至MES",
                            productInventoryUrl+"/"+productInventory,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(orderMesXGHYParam),
                            response,
                            success
                    );
                } catch (Exception e) { }
            }
        } catch (Exception e) {
            return R.error("同步库存至MES"+e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "同步库存至MES",
                        productInventoryUrl+"/"+productInventory,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(orderMesXGHYParam),
                        response,
                        success
                );
            } catch (Exception e) { }
            return R.error("上报失败"+e.getMessage()).add("上报失败"+e.getMessage());
        }
        return R.error("上报失败").add("上报失败");
    }

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

@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;

import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.WrkDetl;
@@ -70,10 +71,10 @@
                this.boxNo = sampleWrkDetl.getBatch();
                this.rollNo = sampleWrkDetl.getModel();
                this.specs = sampleWrkDetl.getMatnr();
                this.length = sampleWrkDetl.getPrice().toString();
                this.length = Cools.isEmpty(sampleWrkDetl.getPrice())? "0" : sampleWrkDetl.getPrice().toString();
                this.splices = sampleWrkDetl.getSpecs();
                this.netWeight = sampleWrkDetl.getWeight().toString();
                this.grossWeight = sampleWrkDetl.getVolume().toString();
                this.netWeight = Cools.isEmpty(sampleWrkDetl.getWeight())? "0" : sampleWrkDetl.getWeight().toString();
                this.grossWeight = Cools.isEmpty(sampleWrkDetl.getVolume())? "0" : sampleWrkDetl.getVolume().toString();
                this.orderSerialNumber = sampleWrkDetl.getOrderNo();
            }

@@ -81,10 +82,10 @@
                this.boxNo = sampleLocDetl.getBatch();
                this.rollNo = sampleLocDetl.getModel();
                this.specs = sampleLocDetl.getMatnr();
                this.length = sampleLocDetl.getPrice().toString();
                this.length = Cools.isEmpty(sampleLocDetl.getPrice())? "0" : sampleLocDetl.getPrice().toString();
                this.splices = sampleLocDetl.getSpecs();
                this.netWeight = sampleLocDetl.getWeight().toString();
                this.grossWeight = sampleLocDetl.getVolume().toString();
                this.netWeight = Cools.isEmpty(sampleLocDetl.getWeight())? "0" : sampleLocDetl.getWeight().toString();
                this.grossWeight = Cools.isEmpty(sampleLocDetl.getVolume())? "0" : sampleLocDetl.getVolume().toString();
            }

            @Override
@@ -230,7 +231,6 @@
                }
                boxPos = sampleWrkDetl.getOrigin();
                boxType = sampleWrkDetl.getBrand$();
                stockType = sampleWrkDetl.getManu();
                packageGroupNo = sampleWrkDetl.getDeadTime();
                OrderMesXGHYParam.Box.Roll roll = new OrderMesXGHYParam.Box.Roll(sampleWrkDetl);


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

@@ -210,6 +210,7 @@
        }
        for (WrkDetl wrkDetl : wrkDetls) {
            if (outOrIn.equals("out")){
                wrkDetl.setManu("成品出库");
                if (!Cools.isEmpty(stockType) && stockType.equals("盘点出库")){
                    wrkDetl.setManu("盘点出库");
                } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("不合格品出库")){
@@ -228,7 +229,7 @@
                    } else {
                        wrkDetl.setManu("成品出库");
                    }
                } else if (wrkDetl.getOrderNo().equals("不合格品出库")){
                } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("不合格品出库")){
                    wrkDetl.setManu("不合格品出库");
                }
            } else {