#

1

13 小时以前 ecee187e81cbb14a4ebd90c2cdc598e7176cdf5f

#

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

@@ -778,7 +778,9 @@
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }
//        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
        if(!basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3)){
            throw new CoolException("更新状态2-3自动组托失败"+ JSON.toJSONString(param));
        }
    }

    @Override

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -1580,6 +1580,7 @@
                            }
                            for (int k = 0; k < billEntryArray.size(); k++) {
                                JSONObject entry = billEntryArray.getJSONObject(k);
                                String memo = null;
                                String matnr = entry.getString("material_number"); //物料编码，内部SKU
                                Double anfmeBox = entry.getDouble("eap7_integerfield");//箱数
                                Double anfme = entry.getDouble("completqty");//个数
@@ -1587,12 +1588,13 @@
                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积
                                String warehouse = entry.getString("warehouse_number");//仓库编码
                                if(kingDeeUtilType.formId.equals("OUI_RECEIVEBIll")){

                                    memo = entry.getString("eap7_textfield3"); //备注（英文描述）
                                }else{
                                    memo = entry.getString("eap7_textfield5");
                                }
                                String pOrderNo = entry.getString("eap7_textfield");//采购单号
                                String s3 = entry.getString("eap7_textfield2");//客户sku（客户编号）
                                String s2 = entry.getString("eap7_textfield1"); //条码UPC
                                String memo = entry.getString("eap7_textfield5"); //备注（英文描述）
                                String s1 = entry.getString("eap7_textfield4"); //客户PO
                                String detlId = entry.getString("id"); //明细id
                                Long seq = entry.getLong("seq"); //分录行号