自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
1
1 天以前 4881f66b288c535c3b9da41ee07c9609bacb8481 
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java


@@ -153,11 +153,11 @@


                    path = orgAddress;


                    break;


                case "PUR_RECEIVEBIll": //已审核收料单查询


                    jsonObject.put("start_biztime",  "2025-01-01 00:00:00");//业务起始日期


                    jsonObject.put("start_biztime",  latestUpdateTime);//业务起始日期


                    jsonObject.put("end_biztime", sdf1.format(now));//业务结束日期


                    jsonObject.put("billno", null);


                    jsonObject.put("billstatus", Arrays.asList("C"));//数据状态 [A:暂存, B:已提交, C:已审核]


                    jsonObject.put("start_auditdate", "2025-11-25 00:00:00");


                    jsonObject.put("start_auditdate", latestUpdateTime);


                    jsonObject.put("end_auditdate", sdf1.format(now));


                    jsonObject.put("org_number", null);


                    jsonObject.put("supplier_number", null);


@@ -171,7 +171,7 @@


                    break;


                case "SAL_RETURNSTOCK"://销售退货


                    path = scpSalreturn;


                    jsonObject.put("modify_starttime",  "2025-11-25 00:00:00");//业务起始日期


                    jsonObject.put("modify_starttime",  latestUpdateTime);//业务起始日期


                    jsonObject.put("billstatus",  "B");//单据状态


                    jsonObject.put("modify_endtime",  sdf1.format(now));//业务起始日期


                    jsonObject.put("billtype_number",  "im_SalOutBill_STD_BT_S_R");//单据类型


@@ -180,7 +180,7 @@


                    path = imMdcMftproorder;


//                    jsonObject.put("start_modifytime",  "2025-11-25 00:00:00");


//                    jsonObject.put("start_auditdate", "2025-11-25 00:00:00");


                    jsonObject.put("start_createtime", "2025-11-25 00:00:00");


                    jsonObject.put("start_createtime", latestUpdateTime);


                    jsonObject.put("end_createtime", sdf1.format(now));


//                    jsonObject.put("end_auditdate", sdf1.format(now));


//                    jsonObject.put("end_modifytime", sdf1.format(now));


@@ -195,7 +195,7 @@


                    jsonObject.put("billno", null);


                    jsonObject.put("org_number", null);


                    jsonObject.put("billstatus", Arrays.asList("C"));//数据状态 [A:暂存, B:已提交, C:已审核]


                    jsonObject.put("start_createtime", "2025-11-25 00:00:00");


                    jsonObject.put("start_createtime", latestUpdateTime);


                    jsonObject.put("end_createtime", sdf1.format(now));


//                    jsonObject.put("start_modifytime",  "2025-11-25 00:00:00");


//                    jsonObject.put("end_modifytime", sdf1.format(now));


@@ -208,7 +208,7 @@


                    jsonObject.put("billno", null);


                    jsonObject.put("org_number", null);


                    jsonObject.put("billstatus", Arrays.asList("C"));//数据状态 [A:暂存, B:已提交, C:已审核]


                    jsonObject.put("start_createtime", "2025-11-25 00:00:00");


                    jsonObject.put("start_createtime", latestUpdateTime);


                    jsonObject.put("end_createtime", sdf1.format(now));


//                    jsonObject.put("start_modifytime",  "2025-11-25 00:00:00");


//                    jsonObject.put("end_modifytime", sdf1.format(now));


@@ -218,13 +218,13 @@


                case "PRD_MORPT"://生产进仓单


                    path = imProductinbill;


                    jsonObject.put("billstatus", Arrays.asList("C"));//数据状态 [A:暂存, B:已提交, C:已审核]


                    jsonObject.put("modifytime_start", "2025-11-25 00:00:00");


                    jsonObject.put("modifytime_start",latestUpdateTime);


                    jsonObject.put("modifytime_end", sdf1.format(now));


                    break;


                case "STK_InspectionForm"://产品检验


                    path = qcppManuinspec;


                    jsonObject.put("billstatus", Arrays.asList("C"));//数据状态 [A:暂存, B:已提交, C:已审核]


                    jsonObject.put("auditdate_start", "2025-11-25 00:00:00");


                    jsonObject.put("auditdate_start", latestUpdateTime);


                    jsonObject.put("auditdate_end", sdf1.format(now));


                    break;


            }


@@ -263,7 +263,7 @@


                JSONArray data = jsonResponse.getJSONObject("data").getJSONArray("rows");


                if(data.size()<=0)  continue;


                //商品档案同步


                if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {


                if(kingDeeUtilType.formId.equals("BD_MATERIAL")) {


                    Tag tag = tagService.selectByName("全部", 1);


                    // 处理分页：根据返回的totalCount和pageSize计算页数


                    int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");


@@ -290,11 +290,12 @@


                            String matnr = jsonObjectNew.get("number").toString();


                            String name = jsonObjectNew.get("name").toString();


                            String createTime = jsonObjectNew.get("createtime").toString();


                            Double grossweight = jsonObjectNew.get("grossweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield6").toString()).doubleValue() : 0.0;


                            Double height = jsonObjectNew.get("height") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield9").toString()).doubleValue() : 0.0;


                            Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield8").toString()).doubleValue() : 0.0;


                            Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield7").toString()).doubleValue() : 0.0;


                            Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield").toString()).doubleValue() : 0.0;


                            Double height = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield9");


                            Double width = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield8");


                            Double length = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield7");


                            Double grossweight= getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield6");


                            Double netweight = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield");


                            Double unit = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield2");


                            // 生成商品档案


                            Double height1 = height*10;


                            Double width1 = width*10;


@@ -307,6 +308,7 @@


                                mat.setTagId(tag.getId());


                                mat.setWeight(grossweight);//净重


                                mat.setUnits(netweight);//毛重


                                mat.setSafeQty(unit);//


                                mat.setManLength(length1);


                                mat.setHeight(height1);


                                mat.setWidth(width1);


@@ -326,6 +328,8 @@


                                    // 更新字段


                                    if (!mat.getMaktx().equals(name)) mat.setMaktx(name);


                                    if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);


                                    if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);


                                    if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);


                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length1);


                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height1);


                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width1);


@@ -419,6 +423,8 @@


                            }


                        }


                    }


                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);


                }


                //收料单


                else if(kingDeeUtilType.formId.equals("PUR_RECEIVEBIll")){


@@ -552,6 +558,12 @@


                                            callApiLogSaveOrder(order,kingDeeUtilType, "编号商品检索失败，请先添加商品"+matnr, false);


                                            continue;


                                        }


                                        if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {


                                            callApiLogSaveOrder(order, kingDeeUtilType,


                                                    "档案箱数量异常：" + matnr, false);


                                            continue;


                                        }


                                        Double erpAnfme = anfme*mat.getSafeQty();


                                        Order order1 = orderService.selectByNo( billNo);


                                        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());


                                        boolean sign = false;


@@ -573,7 +585,7 @@


                                        orderDetl.setThreeCode(detlId);//ERP明细id


                                        orderDetl.setLineNumber(seq);//分录行号


                                        orderDetl.setAnfme(anfme);//总箱数


                                        orderDetl.setErpAnfme(anfme);//erp数据


                                        orderDetl.setErpAnfme(erpAnfme);//erp数据


                                        orderDetl.setOrderId(order.getId());


                                        orderDetl.setOrderNo(order.getOrderNo());//表头单据


                                        orderDetl.setSupp(supp);//供应商名称（货源）


@@ -609,8 +621,9 @@


                                }


                            }


                        }


                        docTypeService.updateById(docType);


                    }


                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);


                }


                //销售出库


                else if(kingDeeUtilType.formId.equals("SAL_OUTSTOCK")){


@@ -728,6 +741,12 @@


                                            "商品不存在：" + matnr, false);


                                    continue;


                                }


                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {


                                    callApiLogSaveOrder(order, kingDeeUtilType,


                                            "档案箱数量异常：" + matnr, false);


                                    continue;


                                }


                                Double erpAnfme = anfme*mat.getSafeQty();


                                // ========= 明细去重 =========


                                List<OrderDetl> orderDetls =


                                        orderDetlService.selectByOrderId(order.getId());


@@ -747,7 +766,7 @@


                                orderDetl.setThreeCode(detlId);


                                orderDetl.setLineNumber(seq);


                                orderDetl.setAnfme(anfme);


                                orderDetl.setErpAnfme(anfme);


                                orderDetl.setErpAnfme(erpAnfme);


                                orderDetl.setOrderId(order.getId());


                                orderDetl.setOrderNo(order.getOrderNo());


                                orderDetl.setSupp(supp);


@@ -869,9 +888,7 @@


                            for (int k = 0; k < billEntryArray.size(); k++) {


                                JSONObject entry = billEntryArray.getJSONObject(k);


                                String matnr = entry.getString("material_number"); //物料编码，内部SKU


//                                Double anfme = entry.getDouble("eap7_decimalfield");//箱数


                                Double anfme = 1.0;//箱数




                                Double anfme = entry.getDouble("eap7_decimalfield");//箱数


                                Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数


                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积


                                String warehouse = entry.getString("warehouse_number");//仓库编码


@@ -896,6 +913,12 @@


                                            "商品不存在：" + matnr, false);


                                    continue;


                                }


                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {


                                    callApiLogSaveOrder(order, kingDeeUtilType,


                                            "档案箱数量异常：" + matnr, false);


                                    continue;


                                }


                                Double erpAnfme = anfme*mat.getSafeQty();


                                // ========= 明细去重 =========


                                List<OrderDetl> orderDetls =


                                        orderDetlService.selectByOrderId(order.getId());


@@ -915,7 +938,7 @@


                                orderDetl.setThreeCode(detlId);


                                orderDetl.setLineNumber(seq);


                                orderDetl.setAnfme(anfme);


                                orderDetl.setErpAnfme(anfme);


                                orderDetl.setErpAnfme(erpAnfme);


                                orderDetl.setOrderId(order.getId());


                                orderDetl.setOrderNo(order.getOrderNo());


                                orderDetl.setSupp(supp);


@@ -941,9 +964,9 @@


                                orderDetlService.insert(orderDetl);


                            }


                        }


                        docType.setUpdateTime(now);


                        docTypeService.updateById(docType);


                    }


                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);


                }


                //产品检验单


                else if(kingDeeUtilType.formId.equals("STK_InspectionForm")){


@@ -1106,9 +1129,9 @@


                                orderDetlService.insert(orderDetl);


                            }


                        }


                        docType.setUpdateTime(now);


                        docTypeService.updateById(docType);


                    }


                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);




                }


                //生产领料，生产补料


@@ -1191,7 +1214,8 @@


                            for (int k = 0; k < billEntryArray.size(); k++) {


                                JSONObject entry = billEntryArray.getJSONObject(k);


                                String matnr = entry.getString("material_number"); //物料编码，内部SKU


                                Double anfme = entry.getDouble("qty");//箱数


                                Double anfme = entry.getDouble("qty");//个数


                                Double anfmeBox = 0.0;//箱数


                                Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数


                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积


                                String warehouse = entry.getString("warehouse_number");//仓库编码


@@ -1203,6 +1227,10 @@


                                String detlId = entry.getString("id"); //明细id


                                Long seq = entry.getLong("seq"); //分录行号


//                                String suppCode = entry.getString("supplier_number");


                                if(anfme == 0){


                                    callApiLogSaveOrder(order,kingDeeUtilType, "单据数量异常"+matnr, false);


                                    continue;


                                }


                                String suppCode = null;


                                if (anfme == null || anfme == 0) {


                                    callApiLogSaveOrder(order, kingDeeUtilType,


@@ -1216,9 +1244,16 @@


                                            "物料档案不存在：" + matnr, false);


                                    continue;


                                }


                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {


                                    callApiLogSaveOrder(order, kingDeeUtilType,


                                            "档案箱数量异常：" + matnr, false);


                                    continue;


                                }


                                anfmeBox = Math.floor(anfme / mat.getSafeQty());


                                // ========= 明细去重 =========


                                List<OrderDetl> orderDetls =


                                        orderDetlService.selectByOrderId(order.getId());






                                boolean exists = orderDetls.stream()


                                        .anyMatch(o -> o.getMatnr().equals(matnr));


@@ -1234,7 +1269,7 @@


                                orderDetl.sync(mat);


                                orderDetl.setThreeCode(detlId);


                                orderDetl.setLineNumber(seq);


                                orderDetl.setAnfme(anfme);


                                orderDetl.setAnfme(anfmeBox);


                                orderDetl.setErpAnfme(anfme);


                                orderDetl.setOrderId(order.getId());


                                orderDetl.setOrderNo(order.getOrderNo());


@@ -1259,12 +1294,13 @@


                                orderDetl.setQty(0.0D);




                                orderDetlService.insert(orderDetl);




                            }


                        }


                        docType.setUpdateTime(now);


                        docTypeService.updateById(docType);


                    }




                    }


                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);


                }


                //生产退料单PRD_ReturnMtrl


                else if(kingDeeUtilType.formId.equals("PRD_ReturnMtrl") ) {


@@ -1357,9 +1393,8 @@


                            for (int k = 0; k < billEntryArray.size(); k++) {


                                JSONObject entry = billEntryArray.getJSONObject(k);


                                String matnr = entry.getString("material_number"); //物料编码，内部SKU


//                                Double anfme = entry.getDouble("eap7_decimalfield");//箱数


                                Double anfme = 1.0;//箱数




                                Double anfme = entry.getDouble("qty");//个数


                                Double anfmeBox = 0.0;


                                Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数


                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积


                                String warehouse = entry.getString("warehouse_number");//仓库编码


@@ -1383,6 +1418,12 @@


                                            "商品不存在：" + matnr, false);


                                    continue;


                                }


                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {


                                    callApiLogSaveOrder(order, kingDeeUtilType,


                                            "档案箱数量异常：" + matnr, false);


                                    continue;


                                }


                                anfmeBox = Math.floor(anfme / mat.getSafeQty());


                                // ========= 明细去重 =========


                                List<OrderDetl> orderDetls =


                                        orderDetlService.selectByOrderId(order.getId());


@@ -1397,11 +1438,12 @@


                                    supp = locSupp.getOwner();


                                }


                                // ========= 保存明细 =========




                                OrderDetl orderDetl = new OrderDetl();


                                orderDetl.sync(mat);


                                orderDetl.setThreeCode(detlId);


                                orderDetl.setLineNumber(seq);


                                orderDetl.setAnfme(anfme);


                                orderDetl.setAnfme(anfmeBox);


                                orderDetl.setErpAnfme(anfme);


                                orderDetl.setOrderId(order.getId());


                                orderDetl.setOrderNo(order.getOrderNo());


@@ -1428,10 +1470,9 @@


                                orderDetlService.insert(orderDetl);


                            }


                        }


                        docType.setUpdateTime(now);


                        docTypeService.updateById(docType);


                    }




                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);


                }


                //生产汇报单


                else if(kingDeeUtilType.formId.equals("PRD_MORPT")) {


@@ -1461,6 +1502,7 @@


                            String owner = "和得科技";


                            String ownerUuid = "BU-00001";


                            String orderId = jsonObjectNew.getString("id");


                            String manuBill = jsonObjectNew.getString("manufacturenun");


                            // ========= 货主校验 =========


                            LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);


//                            if (locOwner == null) {


@@ -1481,7 +1523,7 @@


                                        null,    // 项目编号


                                        orderId,    //收料单id


                                        null,    // 调拨项目编号


                                        null,    // 初始票据号


                                        manuBill,    // 初始票据号


                                        null,    // 票据号


                                        null,    // 项目id


                                        owner,    // 货主


@@ -1524,7 +1566,8 @@


                            for (int k = 0; k < billEntryArray.size(); k++) {


                                JSONObject entry = billEntryArray.getJSONObject(k);


                                String matnr = entry.getString("material_number"); //物料编码，内部SKU


                                Double anfme = entry.getDouble("completqty");//箱数


                                Double anfmeBox = 0.0;//箱数


                                Double anfme = entry.getDouble("completqty");//个数


                                Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数


                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积


                                String warehouse = entry.getString("warehouse_number");//仓库编码


@@ -1549,6 +1592,7 @@


                                            "商品不存在：" + matnr, false);


                                    continue;


                                }


                                anfmeBox = Math.floor(anfme / mat.getSafeQty());


                                // ========= 明细去重 =========


                                List<OrderDetl> orderDetls =


                                        orderDetlService.selectByOrderId(order.getId());


@@ -1567,8 +1611,8 @@


                                orderDetl.sync(mat);


                                orderDetl.setThreeCode(detlId);


                                orderDetl.setLineNumber(seq);


                                orderDetl.setAnfme(anfme);


                                orderDetl.setErpAnfme(anfme);


                                orderDetl.setAnfme(anfmeBox);


                                orderDetl.setErpAnfme(anfme);//汇报单个数


                                orderDetl.setOrderId(order.getId());


                                orderDetl.setOrderNo(order.getOrderNo());


                                orderDetl.setSupp(supp);


@@ -1594,10 +1638,9 @@


                                orderDetlService.insert(orderDetl);


                            }


                        }


                        docType.setUpdateTime(now);


                        docTypeService.updateById(docType);


                    }




                    docType.setUpdateTime(now);


                    docTypeService.updateById(docType);


                }






@@ -1638,5 +1681,19 @@


                "单据编号：" + order.getOrderNo() +  "、状态：" + order.getStatus$(),


                response, bool);


    }


    public Double getDecimalFieldAsDouble(JSONObject jsonObject, String fieldName) {


        Object field = jsonObject.get(fieldName);




        if (field instanceof BigDecimal) {


            return ((BigDecimal) field).doubleValue();


        } else if (field instanceof Integer) {


            return ((Integer) field).doubleValue();


        } else if (field instanceof Double) {


            return (Double) field;


        } else {


            return 0.0; // 默认值


        }


    }






}